SPECS: apache-mod_auth-shadow.spec, apache-mod_auth_any.spec, apac...

glen glen at pld-linux.org
Tue Dec 27 02:33:06 CET 2005


Author: glen                         Date: Tue Dec 27 01:33:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified files

---- Files affected:
SPECS:
   apache-mod_auth-shadow.spec (1.9 -> 1.10) , apache-mod_auth_any.spec (1.28 -> 1.29) , apache-mod_auth_kerb.spec (1.5 -> 1.6) , apache-mod_auth_pam.spec (1.37 -> 1.38) , apache-mod_auth_pgsql.spec (1.29 -> 1.30) , apache-mod_bt.spec (1.4 -> 1.5) , apache-mod_bw.spec (1.24 -> 1.25) , apache-mod_cband.spec (1.10 -> 1.11) , apache-mod_clamav.spec (1.11 -> 1.12) , apache-mod_dosevasive.spec (1.16 -> 1.17) , apache-mod_jk2.spec (1.8 -> 1.9) , apache-mod_log_sql.spec (1.15 -> 1.16) , apache-mod_midgard.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth-shadow.spec
diff -u SPECS/apache-mod_auth-shadow.spec:1.9 SPECS/apache-mod_auth-shadow.spec:1.10
--- SPECS/apache-mod_auth-shadow.spec:1.9	Mon Dec 26 20:17:07 2005
+++ SPECS/apache-mod_auth-shadow.spec	Tue Dec 27 02:33:00 2005
@@ -67,7 +67,7 @@
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install validate $RPM_BUILD_ROOT%{_sbindir}
-echo 'LoadModule auth_shadow_module modules/mod_auth_shadow.so' > \
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 
 %clean
@@ -89,7 +89,7 @@
 %defattr(644,root,root,755)
 %doc CHANGES INSTALL 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(755,root,root) %{_pkglibdir}/*.so
 %attr(4755,root,root) %{_sbindir}/validate
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -98,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.9  2005/12/26 19:17:07  qboosh
 - updated pl
 - don't use glob for suid program in files list

================================================================
Index: SPECS/apache-mod_auth_any.spec
diff -u SPECS/apache-mod_auth_any.spec:1.28 SPECS/apache-mod_auth_any.spec:1.29
--- SPECS/apache-mod_auth_any.spec:1.28	Mon Dec 26 19:26:17 2005
+++ SPECS/apache-mod_auth_any.spec	Tue Dec 27 02:33:00 2005
@@ -105,7 +105,7 @@
 %defattr(644,root,root,755)
 %doc docs/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.28  2005/12/26 18:26:17  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_auth_kerb.spec
diff -u SPECS/apache-mod_auth_kerb.spec:1.5 SPECS/apache-mod_auth_kerb.spec:1.6
--- SPECS/apache-mod_auth_kerb.spec:1.5	Mon Dec 26 19:29:52 2005
+++ SPECS/apache-mod_auth_kerb.spec	Tue Dec 27 02:33:00 2005
@@ -69,7 +69,7 @@
 %defattr(644,root,root,755)
 %doc 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(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -77,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.5  2005/12/26 18:29:52  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_auth_pam.spec
diff -u SPECS/apache-mod_auth_pam.spec:1.37 SPECS/apache-mod_auth_pam.spec:1.38
--- SPECS/apache-mod_auth_pam.spec:1.37	Wed Dec 21 23:46:46 2005
+++ SPECS/apache-mod_auth_pam.spec	Tue Dec 27 02:33:00 2005
@@ -76,9 +76,9 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/{configure,faq}.txt samples/dot-htaccess README
-%config(noreplace) /etc/pam.d/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
+%config(noreplace) /etc/pam.d/httpd
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -86,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.37  2005/12/21 22:46:46  glen
 - rel 5 (rebuild with new apache)
 

================================================================
Index: SPECS/apache-mod_auth_pgsql.spec
diff -u SPECS/apache-mod_auth_pgsql.spec:1.29 SPECS/apache-mod_auth_pgsql.spec:1.30
--- SPECS/apache-mod_auth_pgsql.spec:1.29	Mon Dec 26 19:52:25 2005
+++ SPECS/apache-mod_auth_pgsql.spec	Tue Dec 27 02:33:00 2005
@@ -118,7 +118,7 @@
 %defattr(644,root,root,755)
 %doc *.html
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pgsql.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -126,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.29  2005/12/26 18:52:25  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_bt.spec
diff -u SPECS/apache-mod_bt.spec:1.4 SPECS/apache-mod_bt.spec:1.5
--- SPECS/apache-mod_bt.spec:1.4	Mon Dec 26 20:09:23 2005
+++ SPECS/apache-mod_bt.spec	Tue Dec 27 02:33:00 2005
@@ -61,7 +61,7 @@
 %defattr(644,root,root,755)
 %doc 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(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.4  2005/12/26 19:09:23  glen
 - unified
 - doesn't build, so rel 0.1

================================================================
Index: SPECS/apache-mod_bw.spec
diff -u SPECS/apache-mod_bw.spec:1.24 SPECS/apache-mod_bw.spec:1.25
--- SPECS/apache-mod_bw.spec:1.24	Mon Dec 26 20:12:50 2005
+++ SPECS/apache-mod_bw.spec	Tue Dec 27 02:33:00 2005
@@ -72,9 +72,9 @@
 %defattr(644,root,root,755)
 %doc bw_mod-%{version}.txt LICENSE
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 #%config(noreplace) %verify(not size mtime md5) %attr(640,root,root) /etc/cron.d/%{name}
 #%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,root) %dir %{_var}/run/%{name}
 %attr(750,http,root) %dir %{_var}/run/%{name}/link
 %attr(750,http,root) %dir %{_var}/run/%{name}/master
@@ -85,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.24  2005/12/26 19:12:50  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_cband.spec
diff -u SPECS/apache-mod_cband.spec:1.10 SPECS/apache-mod_cband.spec:1.11
--- SPECS/apache-mod_cband.spec:1.10	Mon Dec 26 20:16:45 2005
+++ SPECS/apache-mod_cband.spec	Tue Dec 27 02:33:00 2005
@@ -68,7 +68,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS Changes INSTALL TODO  conf/*.example
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_*.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.10  2005/12/26 19:16:45  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_clamav.spec
diff -u SPECS/apache-mod_clamav.spec:1.11 SPECS/apache-mod_clamav.spec:1.12
--- SPECS/apache-mod_clamav.spec:1.11	Mon Dec 26 20:26:04 2005
+++ SPECS/apache-mod_clamav.spec	Tue Dec 27 02:33:00 2005
@@ -82,7 +82,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog mod_clamav.html NEWS README TODO
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.11  2005/12/26 19:26:04  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_dosevasive.spec
diff -u SPECS/apache-mod_dosevasive.spec:1.16 SPECS/apache-mod_dosevasive.spec:1.17
--- SPECS/apache-mod_dosevasive.spec:1.16	Mon Dec 26 20:30:07 2005
+++ SPECS/apache-mod_dosevasive.spec	Tue Dec 27 02:33:00 2005
@@ -70,7 +70,7 @@
 %defattr(644,root,root,755)
 %doc 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(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -78,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.16  2005/12/26 19:30:07  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_jk2.spec
diff -u SPECS/apache-mod_jk2.spec:1.8 SPECS/apache-mod_jk2.spec:1.9
--- SPECS/apache-mod_jk2.spec:1.8	Thu Dec 22 11:50:07 2005
+++ SPECS/apache-mod_jk2.spec	Tue Dec 27 02:33:00 2005
@@ -56,7 +56,7 @@
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install jk/build/jk2/apache2/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk2.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,8 +76,8 @@
 %files
 %defattr(644,root,root,755)
 %doc jk/native2/{README.txt,CHANGES.txt} jk/docs/*
-%config(noreplace) %{_sysconfdir}/httpd.conf/*.conf
-%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
@@ -85,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.8  2005/12/22 10:50:07  qboosh
 - added va patch, release 3
 

================================================================
Index: SPECS/apache-mod_log_sql.spec
diff -u SPECS/apache-mod_log_sql.spec:1.15 SPECS/apache-mod_log_sql.spec:1.16
--- SPECS/apache-mod_log_sql.spec:1.15	Tue Dec 27 01:08:21 2005
+++ SPECS/apache-mod_log_sql.spec	Tue Dec 27 02:33:00 2005
@@ -83,7 +83,7 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG TODO contrib docs LICENSE
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
+%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"`)
@@ -92,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.15  2005/12/27 00:08:21  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_midgard.spec
diff -u SPECS/apache-mod_midgard.spec:1.29 SPECS/apache-mod_midgard.spec:1.30
--- SPECS/apache-mod_midgard.spec:1.29	Tue Dec 27 01:21:25 2005
+++ SPECS/apache-mod_midgard.spec	Tue Dec 27 02:33:00 2005
@@ -83,10 +83,10 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog INSTALL INSTALL.ru NEWS README README.ru
-# FIXME
-%config %{_pkglibdir}/midgard-root.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
+# FIXME
+%config %{_pkglibdir}/midgard-root.php
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -94,6 +94,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2005/12/27 01:33:00  glen
+- unified files
+
 Revision 1.29  2005/12/27 00:21:25  glen
 - unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth-shadow.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_any.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_kerb.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_pam.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_pgsql.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_bt.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_bw.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_cband.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_clamav.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_dosevasive.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_jk2.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_log_sql.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_midgard.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list