SPECS: apache-mod_suphp.spec - unified

[glen]

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

---- Files affected:
SPECS:
   apache-mod_suphp.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_suphp.spec
diff -u SPECS/apache-mod_suphp.spec:1.31 SPECS/apache-mod_suphp.spec:1.32
--- SPECS/apache-mod_suphp.spec:1.31	Thu Dec 22 01:54:09 2005
+++ SPECS/apache-mod_suphp.spec	Tue Dec 27 01:56:51 2005
@@ -26,7 +26,6 @@
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 Requires:	apache(modules-api) = %apache_modules_api
-Requires:	apache >= 2.0.52-2
 Requires:	php-cgi
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -81,7 +80,7 @@
 
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
 install src/apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod-suphp.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
@@ -106,10 +105,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog doc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %attr(4755,root,root) %{_sbindir}/suphp
-%attr(755,root,root) %{_pkglibdir}/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
 %dir %{_datadir}/suphp
 %{_datadir}/suphp/*
 
@@ -119,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2005/12/27 00:56:51  glen
+- unified
+
 Revision 1.31  2005/12/22 00:54:09  glen
 - kill apxs dep; rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_suphp.spec?r1=1.31&r2=1.32&f=u