SPECS: apache-mod_macro.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 00:09:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_macro.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_macro.spec
diff -u SPECS/apache-mod_macro.spec:1.1 SPECS/apache-mod_macro.spec:1.2
--- SPECS/apache-mod_macro.spec:1.1	Fri Oct 28 00:06:28 2005
+++ SPECS/apache-mod_macro.spec	Tue Dec 27 01:09:21 2005
@@ -11,13 +11,12 @@
 Source0:	http://www.cri.ensmp.fr/~coelho/mod_macro/mod_%{mod_name}-%{version}.tar.bz2
 # Source0-md5:	c79c299f650b35292d3b71da19e42e45
 URL:		http://www.cri.ensmp.fr/~coelho/mod_macro/
-BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
+BuildRequires:	apache-devel >= 2.0
 Requires:	apache
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Apache module to allow macros in apache config files.
@@ -36,19 +35,19 @@
 install -d $RPM_BUILD_ROOT%{_pkglibdir}
 
 install .libs/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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{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
 
 %preun
 if [ "$1" = "0" ]; then
-	%{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
@@ -57,7 +56,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/12/27 00:09:21  glen
+- unified
+
 Revision 1.1  2005/10/27 22:06:28  zbyniu
 - new
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_macro.spec?r1=1.1&r2=1.2&f=u