SPECS: apache-mod_ntlm.spec - unified

[glen]

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

---- Files affected:
SPECS:
   apache-mod_ntlm.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_ntlm.spec
diff -u SPECS/apache-mod_ntlm.spec:1.17 SPECS/apache-mod_ntlm.spec:1.18
--- SPECS/apache-mod_ntlm.spec:1.17	Sat Sep  4 15:14:00 2004
+++ SPECS/apache-mod_ntlm.spec	Tue Dec 27 01:33:52 2005
@@ -12,15 +12,15 @@
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/modntlm/mod_%{mod_name}2-%{version}.tgz
 # Source0-md5:	8abe4f235af6825f723412e187cac96b
-#Patch0:		%{name}-security.patch
+#Patch0:	%{name}-security.patch
 URL:		http://modntlm.sourceforge.net/
 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
 This is an authentication module for Apache that allows you to
@@ -41,22 +41,22 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-install mod_%{mod_name}.so $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
@@ -64,7 +64,8 @@
 
 %files
 %defattr(644,root,root,755)
-%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
@@ -72,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2005/12/27 00:33:52  glen
+- unified
+
 Revision 1.17  2004/09/04 13:14:00  radek
 - release 0.1: these modules contain security flaws
 
@@ -100,7 +104,7 @@
 - SOA#1.
 
 Revision 1.8  2002/04/25 15:46:24  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.7  2002/02/23 01:23:23  kloczek
 - adapterized.
@@ -113,13 +117,13 @@
 - release 2
 
 Revision 1.4  2002/02/17 18:52:20  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 - adapterized
 
 Revision 1.3  2002/01/18 02:12:21  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.2  2001/09/11 12:39:31  qboosh
 - fixed Summary, added pl translations
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_ntlm.spec?r1=1.17&r2=1.18&f=u