SPECS: php.spec - restored few lost changes with DEVEL merge

[glen]

Author: glen                         Date: Sun Dec 18 20:57:49 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restored few lost changes with DEVEL merge

---- Files affected:
SPECS:
   php.spec (1.516 -> 1.517) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.516 SPECS/php.spec:1.517
--- SPECS/php.spec:1.516	Thu Dec 15 14:20:03 2005
+++ SPECS/php.spec	Sun Dec 18 21:57:41 2005
@@ -287,12 +287,9 @@
 Requires(post,preun):	%{__perl}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
-# Obsolete all php5 packages, this is not to obsolete php4 companion
-Obsoletes:	php >= 4:5.0.0
 
 %description -n apache1-mod_php
 PHP as DSO module for apache 1.3.x.
@@ -307,12 +304,9 @@
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache >= 2.0.52-2
 Requires:	apache(modules-api) = %{apache_modules_api}
-Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
-# Obsolete all php5 packages, this is not to obsolete php4 companion
-Obsoletes:	php >= 4:5.0.0
 
 %description -n apache-mod_php
 PHP as DSO module for apache 2.x.
@@ -1829,6 +1823,7 @@
 # install CLI
 libtool --silent --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
 install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
+echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
 
 # TODO:
 # Why make install doesn't install libphp5.so ?
@@ -2614,6 +2609,7 @@
 %attr(755,root,root) %{_bindir}/php.cli
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
 %{_mandir}/man1/php.1*
+%{_mandir}/man1/php.cli.1*
 
 %files program
 %defattr(644,root,root,755)
@@ -3058,8 +3054,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.517  2005/12/18 20:57:41  glen
+- restored few lost changes with DEVEL merge
+
 Revision 1.516  2005/12/15 13:20:03  arekm
-moved from DEVEL
+- moved from DEVEL
 
 Revision 1.515  2005/12/13 15:59:58  glen
 - adapterized (sorted %verify attrs)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.516&r2=1.517&f=u