Attachment 860812 Details for Bug 850188 – remove rhel 4 support

[patch] remove rhel 4 support

0002-remove-RHEL-4-support.patch (text/plain), 2.89 KB, created by Ken Dreyer on 2014-02-08 04:02:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ken Dreyer

Created: 2014-02-08 04:02:39 UTC

Size: 2.89 KB

patch

obsolete

>From 4006875e9592b81b2d8267186ba8ee770d96d1d5 Mon Sep 17 00:00:00 2001
>From: Ken Dreyer <ktdreyer@ktdreyer.com>
>Date: Fri, 7 Feb 2014 20:26:00 -0700
>Subject: [PATCH 2/3] remove RHEL 4 support
>
>There were a couple of conditionals in place to support RHEL 4. Remove
>these to clean up the spec.
>---
> lighttpd.spec | 28 +++++++---------------------
> 1 file changed, 7 insertions(+), 21 deletions(-)
>
>diff --git a/lighttpd.spec b/lighttpd.spec
>index cd59c51..45bb6ae 100644
>--- a/lighttpd.spec
>+++ b/lighttpd.spec
>@@ -1,13 +1,5 @@
> %define webroot /var/www/lighttpd
> 
>-# RHEL4's rpm doesn't have the bcond macros
>-%if 0%{?rhel} <= 4
>-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
>-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
>-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
>-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
>-%endif
>-
> # We have an bunch of --with/--without options to pass, make it easy with bcond
> %define confswitch() %{expand:%%{?with_%{1}:--with-%{1}}%%{!?with_%{1}:--without-%{1}}}
> 
>@@ -18,6 +10,7 @@
> %bcond_without kerberos5
> %bcond_without pcre
> %bcond_without fam
>+%bcond_with    lua
> # We can't have bcond names with hyphens
> %bcond_with    webdavprops
> %bcond_with    webdavlocks
>@@ -25,17 +18,10 @@
> %bcond_with    memcache
> 
> # No poweredby.png image in EL5 and earlier (it's in Fedora and EL6+)
>-%if 0%{?rhel} <= 5
>-%bcond_with    systemlogos
>-%else
>+%if 0%{?el5}
> %bcond_without systemlogos
>-%endif
>-
>-# LUA support requires lua >= 5.1 but EPEL4 provides only 5.0, so disable
>-%if 0%{?rhel} <= 4
>-%bcond_with    lua
> %else
>-%bcond_without lua
>+%bcond_with    systemlogos
> %endif
> 
> # The /var/run/lighttpd directory uses tmpfiles.d when mounted using tmpfs
>@@ -74,7 +60,7 @@ Source101: lighttpd-mod_geoip.txt
> Patch0: lighttpd-1.4.28-defaultconf.patch
> Patch1: lighttpd-1.4.34-mod_geoip.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
>-# For the target poweredby.png image (skip requirement + provide image on RHEL)
>+# For the target poweredby.png image (skip requirement + provide image on EL5)
> %if %{with systemlogos}
> Requires: system-logos >= 7.92.1
> %endif
>@@ -99,8 +85,8 @@ BuildRequires: /usr/bin/awk
> %{?with_gdbm:BuildRequires: gdbm-devel}
> %{?with_memcache:BuildRequires: memcached-devel}
> %{?with_lua:BuildRequires: lua-devel}
>-# On RHEL <= 5 we still need this because of the "broken" lua
>-%if 0%{?rhel} <= 5
>+# On EL5 we still need this because of the "broken" lua
>+%if 0%{?el5}
> BuildRequires: readline-devel
> %endif
> 
>@@ -199,7 +185,7 @@ mkdir -p %{buildroot}%{webroot}
> install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
>     %{buildroot}%{webroot}/
> 
>-# Symlink for the powered-by-$DISTRO image (install empty image on RHEL)
>+# Symlink for the powered-by-$DISTRO image (install empty image on EL5)
> %if %{with systemlogos}
> ln -s %{_datadir}/pixmaps/poweredby.png \
> %else
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 850188: 860811 | 860812 | 860813