- new IPv6 patches from KAME and Japan Linux IPv6 Users Group

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index a30b50fb27c191a4f23fcd47fe09867a8e8036b0..c7f8534b40eef68f6d5a482c347430207dc28ccd 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -4,27 +4,31 @@ Summary(fr):  Serveur Web leader du march
 Summary(pl):   Serwer WWW (World Wide Web) ze wsparciem dla IPv6
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
-Version:       1.3.6
-Release:       2.2
+Version:       1.3.9
+Release:       5
 Group:         Networking/Daemons
 Group(pl):     Sieciowe/Serwery
 Source0:       ftp://ftp.apache.org/apache/dist/%{name}_%{version}.tar.gz
 Source1:       apache.init
-Source2:       %{name}.logrotate
-Source3:       %{name}-extra1.tar.bz2
-Source6:       apache_1.3.6.tar.gz.asc
-Source7:       apache_1.3.6.tar.gz.md5
+Source2:       apache.logrotate
+Source3:       apache-extra1.tar.bz2
 Source8:       apache.sysconfig
-Patch0:                %{name}-suexec.patch
-Patch1:                apache-136-v6-19990616-PLD.diff
-Patch2:                %{name}-htdocs.patch
-Patch3:                %{name}-release.patch
-Patch4:                apache-ndbm.patch
+Patch0:                apache-suexec.patch
+Patch1:                ftp://ftp.kame.net/pub/kame/misc/apache-139-v6-19991013a.diff.gz
+Patch2:                ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/Net/IPv6/Patches/apache-139-v6-19991013a.new4.patch.gz
+Patch3:                ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/Net/IPv6/Patches/apache-139-v6-19991013a.new4_to_4.1.patch
+Patch4:                apache-htdocs.patch
+Patch5:                apache-release.patch
+Patch6:                apache-pld.patch
 Copyright:     BSD-like
 Provides:      httpd
 Provides:      webserver
 Prereq:                /sbin/chkconfig
 Prereq:                /usr/sbin/useradd
+Prereq:                /usr/bin/getgid
+Prereq:                /usr/bin/id
+Prereq:                sh-utils
+Requires:      rc-scripts
 URL:           http://www.apache.org/
 BuildRoot:     /tmp/%{name}-%{version}-root
 Obsoletes:     apache-extra
@@ -106,6 +110,8 @@ Dokumentacja do Apache w formacie HTML.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 OPTIM="$RPM_OPT_FLAGS" LDFLAGS="-s" \
@@ -119,6 +125,7 @@ OPTIM="$RPM_OPT_FLAGS" LDFLAGS="-s" \
        --localstatedir=/var \
        --runtimedir=/var/run \
        --logfiledir=/var/log/httpd \
+       --with-layout=PLD \
        --without-confadjust \
        --enable-module=all \
        --enable-shared=max \
@@ -128,7 +135,8 @@ OPTIM="$RPM_OPT_FLAGS" LDFLAGS="-s" \
        --suexec-caller=http \
        --suexec-uidmin=500 \
        --suexec-gidmin=500 \
-       --enable-rule=INET6 
+       --enable-rule=INET6 \
+       --disable-rule=WANTHSREGEX
 make
 
 %install
@@ -136,20 +144,16 @@ rm -rf $RPM_BUILD_ROOT
 
 make install-quiet root="$RPM_BUILD_ROOT"
 
-mv $RPM_BUILD_ROOT%{_datadir}/htdocs $RPM_BUILD_ROOT%{_datadir}/html
+#mv $RPM_BUILD_ROOT%{_datadir}/htdocs $RPM_BUILD_ROOT%{_datadir}/html
 
-install -d $RPM_BUILD_ROOT/etc/{httpd,logrotate.d,rc.d/init.d,sysconfig}
-install -d $RPM_BUILD_ROOT%{_datadir}/{html/manual,icons,cgi-bin}
-install -d $RPM_BUILD_ROOT/{usr/{lib/apache,sbin,share,man/man{1,8}},var/log/httpd}
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
+       $RPM_BUILD_ROOT/var/log/httpd
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/apache
 
-install -d $RPM_BUILD_ROOT%{_includedir}
-
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*
-rm -f $RPM_BUILD_ROOT%{_datadir}/html/manual/expand.pl
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log
 
@@ -158,29 +162,33 @@ cp -a apache-extra/icons/*        $RPM_BUILD_ROOT%{_datadir}/icons
 cp -a apache-extra/*.conf      $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a apache-extra/m*          $RPM_BUILD_ROOT%{_sysconfdir}
 
-mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir}
-
-strip $RPM_BUILD_ROOT%{_libexecdir}/*
+strip $RPM_BUILD_ROOT%{_libexecdir}/* || :
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
        ABOUT_APACHE src/CHANGES KEYS README README.v6
 
 %pre
-if [ -n `id -g http` ]; then
-       if [ "`id -g http`" != "51" ]; then
-               echo "Warning: group http haven't gid=51. Corect this before install apache"
+if [ -n "`getgid http`" ]; then
+       if [ "`getgid http`" != "51" ]; then
+               echo "Warning: group http haven't gid=51. Corect this before install apache" 1>&2
                exit 1
        fi
 else
-       /usr/sbin/groupadd -u 51 -r -f httpd
+       /usr/sbin/groupadd -g 51 -r -f http
+       if [ -f /var/db/group.db ]; then
+               /usr/bin/update-db 1>&2
+       fi
 fi
-if [ -n `id -u http` ]; then
-       if [ "`id -g http`" != "51" ]; then
-               echo "Warning: user http haven't gid=51. Corect this before install apache"
+if [ -n "`id -u http 2>/dev/null`" ]; then
+       if [ "`id -u http`" != "51" ]; then
+               echo "Warning: user http haven't uid=51. Corect this before install apache" 1>&2
                exit 1
        fi
 else
-       /usr/sbin/useradd -u 51 -r -f httpd
+       /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
+       if [ -f /var/db/passwd.db ]; then
+               /usr/bin/update-db 1>&2
+       fi
 fi
 
 
@@ -200,6 +208,18 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del httpd
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+       /usr/sbin/userdel http
+       if [ -f /var/db/passwd.db ]; then
+               /usr/bin/update-db
+       fi
+       /usr/sbin/groupdel http
+       if [ -f /var/db/group.db ]; then
+               /usr/bin/update-db
+       fi
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT