X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_rpaf.git;a=blobdiff_plain;f=apache1-mod_rpaf.spec;h=521984eaa764bb7e0dee39f00efd50d5f8304de8;hp=363dd5e8904ae296adde7bc180842c6c3d9c36ca;hb=238fefaae2ab1148fce69c25528027fc7c3ea0b5;hpb=329061f84338eab6134bec68fdff50a4b61f1ad7;ds=sidebyside

diff --git a/apache1-mod_rpaf.spec b/apache1-mod_rpaf.spec
index 363dd5e..521984e 100644
--- a/apache1-mod_rpaf.spec
+++ b/apache1-mod_rpaf.spec
@@ -1,21 +1,28 @@
-# TODO
-# - compile fails when apache1 is compiled with ipv6
+#
+# Conditional build:
+%bcond_without	ipv6		# disable IPv6 support
+#
 %define		mod_name	rpaf
 %define 	apxs		%{_sbindir}/apxs1
-Summary:	Apache module: record traffic statistics into a database
-Summary(pl):	Modu³ Apache'a: zapisywanie statystyk ruchu do bazy danych
+Summary:	Reverse proxy add forward module for Apache
+Summary(pl.UTF-8):	Moduł Apache'a dodający przekazywanie dla odwrotnych proxy
 Name:		apache1-mod_%{mod_name}
 Version:	0.5
-Release:	0.13
+Release:	5
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://stderr.net/apache/rpaf/download/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	471fb059d6223a394f319b7c8ab45c4d
 Source1:	%{name}.conf
+Patch0:		%{name}-ipv6.patch
 URL:		http://stderr.net/apache/rpaf/
+%{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
 BuildRequires:	apache1-devel >= 1.3.33-2
-BuildConflicts:	apache1(ipv6)-devel
-Requires:	apache1 >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
+%{!?with_ipv6:BuildConflicts:	apache1(ipv6)-devel}
+Requires:	apache1(EAPI)
+Provides:	apache(mod_rpaf)
+%{!?with_ipv6:Conflicts:	apache1(ipv6)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -24,18 +31,25 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 rpaf is for backend Apache servers what mod_proxy_add_forward is for
 frontend Apache servers. It does excactly the opposite of
-mod_proxy_add_forward written by Ask Bjørn Hansen. It will also work
+mod_proxy_add_forward written by Ask Bjoern Hansen. It will also work
 with mod_proxy in Apache starting with release 1.3.25.
 
-%description -l pl
-rpaf jest dla backendowych serwerów Apache tym, czym
-mod_proxy_add_forward jest dla frontendowych. Wykonuje dok³adnie
+%description -l en.UTF-8
+rpaf is for backend Apache servers what mod_proxy_add_forward is for
+frontend Apache servers. It does excactly the opposite of
+mod_proxy_add_forward written by Ask Bjørn Hansen. It will also work
+with mod_proxy in Apache starting with release 1.3.25.
+
+%description -l pl.UTF-8
+rpaf jest dla backendowych serwerów Apache tym, czym
+mod_proxy_add_forward jest dla frontendowych. Wykonuje dokładnie
 przeciwne operacje do mod_proxy_add_forward napisanego przez Aska
-Bjorna Hansena. Bêdzie tak¿e dzia³aæ z mod_proxy w Apache'u pocz±wszy
+Bjoerna Hansena. Będzie także działać z mod_proxy w Apache'u począwszy
 od wersji 1.3.25.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%{?with_ipv6:%patch0 -p1}
 
 %build
 %{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
@@ -51,19 +65,15 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/99_mod_%{mod_name}.conf
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES test.pl
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*