SPECS (DEVEL): php4.spec - copy Obsoletes from main package - main...

[glen]

Author: glen                         Date: Sat Jul  9 19:24:46 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- copy Obsoletes from main package
- main package is empty since now

---- Files affected:
SPECS:
   php4.spec (1.421.2.3.2.30 -> 1.421.2.3.2.31) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.30 SPECS/php4.spec:1.421.2.3.2.31
--- SPECS/php4.spec:1.421.2.3.2.30	Sat Jul  9 21:21:18 2005
+++ SPECS/php4.spec	Sat Jul  9 21:24:40 2005
@@ -209,10 +209,6 @@
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	apr-util-devel >= 1:1.0.0
 %endif
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php = %{epoch}:%{version}-%{release}
-Obsoletes:	phpfi
-Obsoletes:	apache-mod_php < 1:4.1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/php4
@@ -287,13 +283,14 @@
 %package -n apache1-mod_php4
 Summary:	php4 DSO module for apache 1.3.x
 Group:		Development/Languages/PHP
-# TODO: how to ensure proper sapi upgrade? assume apache2 was on by default?
 PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
 Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Provides:	php4 = %{epoch}:%{version}-%{release}
+Obsoletes:	phpfi
+Obsoletes:	apache-mod_php < 1:4.1.1
 # Obsolete last version when apache module was in main package
 Obsoletes:	php4 < 3:4.3.11-4.16
 
@@ -309,6 +306,8 @@
 Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Provides:	php4 = %{epoch}:%{version}-%{release}
+Obsoletes:	phpfi
+Obsoletes:	apache-mod_php < 1:4.1.1
 # Obsolete last version when apache module was in main package
 Obsoletes:	php4 < 3:4.3.11-4.16
 
@@ -2920,6 +2919,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.31  2005/07/09 19:24:40  glen
+- copy Obsoletes from main package
+- main package is empty since now
+
 Revision 1.421.2.3.2.30  2005/07/09 19:21:18  glen
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.421.2.3.2.30&r2=1.421.2.3.2.31&f=u