SPECS: apache-mod_auth-shadow.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 18:08:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_auth-shadow.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth-shadow.spec
diff -u SPECS/apache-mod_auth-shadow.spec:1.6 SPECS/apache-mod_auth-shadow.spec:1.7
--- SPECS/apache-mod_auth-shadow.spec:1.6	Wed Aug  6 18:11:02 2003
+++ SPECS/apache-mod_auth-shadow.spec	Mon Dec 26 19:08:45 2005
@@ -13,14 +13,14 @@
 Source0:	http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{orig_name}-%{version}.tar.gz
 # Source0-md5:	46164ccb94489415021a041daa8a3ded
 Patch0:		%{name}-path.patch
-URL:		http://www.jdimedia.nl/igmar/mod_%{mod_name}/
+URL:		http://www.jdimedia.nl/igmar/mod_auth-shadow/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache
+BuildRequires:	apache-devel >= 2.0
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Apache module: authenticating against a /etc/shadow file
@@ -30,7 +30,6 @@
 
 %prep
 %setup -q -n mod_%{orig_name}-%{version}
-
 %patch0 -p1
 
 %build
@@ -39,23 +38,23 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}/httpd.conf}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install validate $RPM_BUILD_ROOT%{_sbindir}
+echo 'LoadModule auth_shadow_module modules/mod_auth_shadow.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
@@ -64,16 +63,19 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(4755,root,root) %{_sbindir}/*
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/26 18:08:45  glen
+- unified
+
 Revision 1.6  2003/08/06 16:11:02  kloczek
 - może wrescie ktoś wykasuje to konto ?
 
@@ -82,4 +84,3 @@
 
 Revision 1.4  2003/06/01 13:51:03  malekith
 - adpaterized (to get Revision: in first line)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth-shadow.spec?r1=1.6&r2=1.7&f=u