X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=boa.spec;h=5fa7e18af117a848a2d8349370709b1f71d6cfb2;hb=e77eb2e61afe759c53e85be77f4803ba11e648d7;hp=994245c9ad7ebe8959998df3a7077a0cfedc04a9;hpb=96dbfad07b67b6b7724d819143581b988c9ebd0b;p=packages%2Fboa.git

diff --git a/boa.spec b/boa.spec
index 994245c..5fa7e18 100644
--- a/boa.spec
+++ b/boa.spec
@@ -1,38 +1,44 @@
 #
 # Conditional build:
-# _without_ipv6	- IPv4-only version (doesn't require IPv6 in kernel)
+%bcond_without 	ipv6	# IPv4-only version (doesn't require IPv6 in kernel)
 #
 Summary:	Boa high speed HTTP server
 Summary(pl):	Boa - szybki serwer HTTP
 Name:		boa
-Version:	0.94.13
-Release:	1
+Version:	0.94.14
+%define	_rc	rc17
+Release:	0.%{_rc}.3
 Epoch:		1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.boa.org/%{name}-%{version}.tar.gz
+Source0:	http://www.boa.org/%{name}-%{version}%{_rc}.tar.gz
+# Source0-md5:	d668ef85b3d2df3dc9832555fdce8b70
 Source1:	%{name}.init
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-logrotate.patch
 URL:		http://www.boa.org/
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	flex
+BuildRequires:	rpmbuild(macros) >= 1.159
 BuildRequires:	sgml-tools
 PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(post,preun):	/sbin/chkconfig
+Provides:	group(http)
 Provides:	httpd
+Provides:	user(http)
 Provides:	webserver
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	apache
 Obsoletes:	httpd
 Obsoletes:	thttpd
 Obsoletes:	webserver
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/httpd
 
@@ -50,31 +56,31 @@ znacznie zwi
 systemowych.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{_rc}
+cp examples/boa.conf .
+%patch0 -p0
 %patch1	-p0
 
 %build
-cd src
-CFLAGS="%{rpmcflags} %{!?_without_ipv6:-DINET6}"
+cp -f /usr/share/automake/config.sub .
+CFLAGS="%{rpmcflags} %{?with_ipv6:-DINET6} -DSERVER_ROOT='\"/etc/httpd\"'"
 %{__autoconf}
 %configure
 %{__make}
-cd ../docs
-%{__make} boa.html
+%{__make} -C docs boa.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/ \
 	$RPM_BUILD_ROOT/var/log/httpd \
-	$RPM_BUILD_ROOT/home/services/httpd/{cgi-bin,html} \
+	$RPM_BUILD_ROOT/srv/httpd/{cgi-bin,html} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/conf,%{_mandir}/man8} \
 	$RPM_BUILD_ROOT/etc/logrotate.d
 
 install src/{boa,boa_indexer} $RPM_BUILD_ROOT%{_sbindir}/
 
-install src/*.pl $RPM_BUILD_ROOT/home/services/httpd/cgi-bin/
-install examples/* $RPM_BUILD_ROOT/home/services/httpd/cgi-bin/
+install src/*.pl $RPM_BUILD_ROOT/srv/httpd/cgi-bin/
+install examples/* $RPM_BUILD_ROOT/srv/httpd/cgi-bin/
 install	%{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 install boa.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
@@ -89,46 +95,44 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 if [ -n "`getgid http`" ]; then
-        if [ "`getgid http`" != "51" ]; then
-	        echo "Error: group http doesn't have gid=51. Correct this before installing boa." 1>&2
-            exit 1
-        fi
+	if [ "`getgid http`" != "51" ]; then
+		echo "Error: group http doesn't have gid=51. Correct this before installing boa." 1>&2
+		exit 1
+	fi
 else
-        echo "Creating group http GID=51"
-        /usr/sbin/groupadd -g 51 -r -f http
+	echo "Creating group http GID=51"
+	/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 "Error: user http doesn't have uid=51. Correct this before installing boa." 1>&2
-                exit 1
-        fi
+	if [ "`id -u http`" != "51" ]; then
+		echo "Error: user http doesn't have uid=51. Correct this before installing boa." 1>&2
+		exit 1
+	fi
 else
 	echo "Creating user http UID=51"
-        /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
+	/usr/sbin/useradd -u 51 -r -d /srv/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
 fi
 
 %postun
 if [ "$1" = "0" ]; then
-	echo "Removing user http UID=51"
-	/usr/sbin/userdel http > /dev/null 2>&1
-	echo "Removing group http GID=51"
-        /usr/sbin/groupdel http > /dev/null 2>&1
+	%userremove http
+	%groupremove http
 fi
 
 %post
 /sbin/chkconfig --add boa
 if [ -f /var/lock/subsys/boa ]; then
-        /etc/rc.d/init.d/boa restart 1>&2
+	/etc/rc.d/init.d/boa restart 1>&2
 else
-        echo "Run \"/etc/rc.d/init.d/boa start\" to start boa http daemon."
+	echo "Run \"/etc/rc.d/init.d/boa start\" to start boa http daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/boa ]; then
-                /etc/rc.d/init.d/boa stop 1>&2
-        fi
-        /sbin/chkconfig --del boa
+	if [ -f /var/lock/subsys/boa ]; then
+		/etc/rc.d/init.d/boa stop 1>&2
+	fi
+	/sbin/chkconfig --del boa
 fi
 
 %files
@@ -137,9 +141,9 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/*
 %attr(640,root,root) %config(noreplace) /etc/logrotate.d/%{name}
-%dir /home/services/httpd
-%attr(755,root,root) /home/services/httpd/html
-%attr(755,root,root) /home/services/httpd/cgi-bin
+%dir /srv/httpd
+%attr(755,root,root) /srv/httpd/html
+%attr(755,root,root) /srv/httpd/cgi-bin
 %attr(750,root,root) %dir /var/log/httpd/
 %attr(640,root,root) %ghost /var/log/httpd/*
 %attr(755,root,root) %{_sbindir}/*