X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_cvs.spec;h=b3f7166367bd2744faee3c3755f4911e03251519;hb=e74c6f4a62351b7a9b8f8f06fcd71f4380b57b9a;hp=57cdbc0777e9929ff43ff2365a085adc79ccc6a3;hpb=d2059eeabd9a0943cb8167e805345f005a215871;p=packages%2Fapache-mod_cvs.git

diff --git a/apache-mod_cvs.spec b/apache-mod_cvs.spec
index 57cdbc0..b3f7166 100644
--- a/apache-mod_cvs.spec
+++ b/apache-mod_cvs.spec
@@ -1,62 +1,60 @@
 %define		mod_name	cvs
-Summary:	Apache module: Automatically updates files in a CVS-based webtree.
-Summary(pl):	Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS
+%define 	apxs		/usr/sbin/apxs
+Summary:	Apache module: Automatically updates files in a CVS-based webtree
+Summary(pl.UTF-8):	Moduł do apache: Automatyczne uaktualnianie plików z drzewa CVS
 Name:		apache-mod_%{mod_name}
-Version:	0.4
-Release:	1
-Copyright:	GPL
+Version:	0.5.91
+Release:	2
+License:	GPL
 Group:		Networking/Daemons
-Group(pl):	Sieciowe/Serwery
-Source0:	mod_%{mod_name}-%{version}.tar.gz
-URL:		http://www.sub.nu/mod_cvs/
-BuildRequires:	/usr/sbin/apxs
+Source0:	http://resare.com/noa/mod_cvs/dist/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5:	ef100c30ff734464c6194a2e707136b5
+URL:		http://www.resare.com/noa/mod_cvs/
+BuildRequires:	%{apxs}
 BuildRequires:	apache-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-Prereq:		%{_sbindir}/apxs
-BuildRequires:	%{_sbindir}/apxs
-Requires:	apache
-BuildRoot:	/tmp/%{name}-%{version}-root
+Requires(triggerpostun):	%{apxs}
+Requires:	apache(modules-api) = %apache_modules_api
+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: On-the-fly decompression of HTML documents.
+Apache module: Automatically updates files in a CVS-based webtree.
 
-%description -l pl
-Modu³ do apache: dekompresuje dokumenty HTML w locie.
+%description -l pl.UTF-8
+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
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 
-strip --strip-unneeded $RPM_BUILD_ROOT%{_pkglibdir}/* 
+%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
-fi
+%service -q httpd restart
 
-%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
-	fi
+	%service -q httpd restart
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
+%doc README doc/*.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*