X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_cvs.spec;h=16c5cb5c3f959ce2719c7c26d91ef266fa66ae63;hb=b0528b073323995412440884bf31ab2e3660188d;hp=4eaeb1a4a42e631b0dabd827731141af21560088;hpb=91066afd148e91f9d456391bdb12b955d35009ac;p=packages%2Fapache1-mod_cvs.git

diff --git a/apache1-mod_cvs.spec b/apache1-mod_cvs.spec
index 4eaeb1a..16c5cb5 100644
--- a/apache1-mod_cvs.spec
+++ b/apache1-mod_cvs.spec
@@ -1,23 +1,27 @@
 %define		mod_name	cvs
+%define 	apxs		/usr/sbin/apxs1
 Summary:	Apache module: Automatically updates files in a CVS-based webtree
 Summary(pl):	Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS
-Name:		apache-mod_%{mod_name}
-Version:	0.4
+Name:		apache1-mod_%{mod_name}
+Version:	0.5
 Release:	2
 License:	GPL
 Group:		Networking/Daemons
-Group(de):	Netzwerkwesen/Server
-Group(pl):	Sieciowe/Serwery
+# working URL: http://www.sub.nu/mod_cvs/src/
+# (but only separate files here, no tarball)
 Source0:	ftp://ftp.sub.nu/pub/mod_cvs/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5:	e2cfe7818337915e6cbaffa45852012f
 URL:		http://www.sub.nu/mod_cvs/
-BuildRequires:	/usr/sbin/apxs
-BuildRequires:	apache-devel
+BuildRequires:	%{apxs}
+BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	zlib-devel
-Prereq:		/usr/sbin/apxs
-Requires:	apache
+Requires(triggerpostun):	%{apxs}
+Requires:	apache1 >= 1.3.33-2
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(/usr/sbin/apxs -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Apache module: Automatically updates files in a CVS-based webtree.
@@ -25,35 +29,44 @@ Apache module: Automatically updates files in a CVS-based webtree.
 %description -l pl
 Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS.
 
-%prep 
+%prep
 %setup -q -n mod_%{mod_name}-%{version}
 
 %build
-/usr/sbin/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lz
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lz
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
 fi
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi
 
+%triggerpostun -- apache1-mod_%{mod_name} < 0.5-1.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+fi
+
 %files
 %defattr(644,root,root,755)
+%doc README
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*