- reverting last change: removing new macros from %p{re,ost}{,un}

[packages/boa.git] / boa.spec

diff --git a/boa.spec b/boa.spec
index 6bb3950a6200e096435c744d8f6a22dd0361203d..19f398971b51abc3033232667e1d5440c038e468 100644 (file)
--- a/boa.spec
+++ b/boa.spec
@@ -1,12 +1,12 @@
 Summary:       Boa high speed HTTP server
 Summary(pl):   Boa - szybki serwer HTTP
 Name:          boa
-Version:       0.94.8.2
-Release:       1
+Version:       0.94.8.3
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
-Group(pl):     Sieciowe/Serwery
 Group(de):     Netzwerkwesen/Server
+Group(pl):     Sieciowe/Serwery
 Source0:       http://www.boa.org/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Patch0:                %{name}-PLD.patch
@@ -18,8 +18,10 @@ Prereq:              %{_sbindir}/groupdel
 Prereq:                %{_sbindir}/useradd
 Prereq:                %{_sbindir}/userdel
 BuildRequires: flex
-Requires:      rc-scripts
+BuildRequires: sgml-tools
+Prereq:                rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     apache
 
 %define                _sysconfdir     /etc/httpd
 
@@ -42,7 +44,7 @@ systemowych.
 
 %build
 cd src
-CFLAGS="$RPM_OPT_FLAGS -DINET6"
+CFLAGS="%{rpmcflags} -DINET6"
 %configure
 %{__make}
 (cd ../docs; make boa.html )
@@ -53,8 +55,7 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d/,/var/log/httpd} \
        $RPM_BUILD_ROOT/home/httpd/{cgi-bin,html} \
        $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/conf,%{_mandir}/man8}
 
-install -s src/boa $RPM_BUILD_ROOT%{_sbindir}
-install -s src/boa_indexer $RPM_BUILD_ROOT%{_sbindir}
+install src/{boa,boa_indexer} $RPM_BUILD_ROOT%{_sbindir}
 
 install src/*.pl $RPM_BUILD_ROOT/home/httpd/cgi-bin
 install examples/resolver.pl $RPM_BUILD_ROOT/home/httpd/cgi-bin
@@ -66,23 +67,45 @@ install docs/boa.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access_log,agent_log,error_log,referer_log}
 
-gzip -9nf README $RPM_BUILD_ROOT%{_mandir}/man*/*
+gzip -9nf README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/groupadd -g 51 -f http > /dev/null 2>&1
-%{_sbindir}/useradd -u 51 -f http -g http > /dev/null 2>&1
+if [ -n "`getgid http`" ]; then
+        if [ "`getgid http`" != "51" ]; then
+                echo "Warning:group http haven't gid=51. Correct this before install boa" 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/groupadd -g 51 -r -f http
+fi
+if [ -n "`id -u http 2>/dev/null`" ]; then
+        if [ "`id -u http`" != "51" ]; then
+                echo "Warning:user http haven't uid=51. Correct this before install boa" 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
+fi
+
 
 %postun
 if [ "$1" = "0" ]; then
-       %{_sbindir}/groupdel http > /dev/null 2>&1
        %{_sbindir}/userdel http > /dev/null 2>&1
+       %{_sbindir}/groupdel http > /dev/null 2>&1
 fi
 
 %post
-/sbin/chkconfig -add %{name}
+/sbin/chkconfig --add %{name}
+
+if [ -f /var/lock/subsys/httpd ]; then
+        /etc/rc.d/init.d/httpd restart 1>&2
+else
+        echo "Run \"/etc/rc.d/init.d/boa start\" to start boa http daemon."
+fi
+
 
 %preun
 if [ "$1" = "0" ]; then