SPECS: php.spec - drop -reflection.patch (arekm said it was just c...

[glen]

Author: glen                         Date: Wed Nov  8 14:35:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop -reflection.patch (arekm said it was just compile fix)
- use -cli instead of -program in pncntl deps

---- Files affected:
SPECS:
   php.spec (1.599 -> 1.600) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.599 SPECS/php.spec:1.600
--- SPECS/php.spec:1.599	Tue Nov  7 21:20:45 2006
+++ SPECS/php.spec	Wed Nov  8 15:35:18 2006
@@ -69,7 +69,7 @@
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
-%define	_rel 0.3
+%define	_rel 0.5
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -100,7 +100,7 @@
 Patch6:		%{name}-build_modules.patch
 Patch7:		%{name}-sapi-ini-file.patch
 Patch8:		%{name}-no-metaccld.patch
-Patch9:		%{name}-reflection.patch
+
 Patch10:	%{name}-ini.patch
 Patch11:	%{name}-acam.patch
 Patch14:	%{name}-allow-db31.patch
@@ -364,19 +364,19 @@
 Requires:	php-dirs
 Provides:	%{name}-libxml = %{epoch}:%{version}-%{release}
 Provides:	%{name}-overload = %{epoch}:%{version}-%{release}
+%{?with_pcre:Provides:	%{name}-pcre = %{epoch}:%{version}-%{release}}
 Provides:	%{name}-session = %{epoch}:%{version}-%{release}
 Provides:	%{name}-simplexml = %{epoch}:%{version}-%{release}
 Provides:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	%{name}-standard = %{epoch}:%{version}-%{release}
-%{?with_pcre:Provides:	%{name}-pcre = %{epoch}:%{version}-%{release}}
 Provides:	php(modules_api) = %{php_api_version}
 Provides:	php(zend_extension_api) = %{zend_extension_api}
 Provides:	php(zend_module_api) = %{zend_module_api}
 Provides:	php5(debug) = %{php_debug}
 Provides:	php5(thread-safety) = %{zend_zts}
+#Obsoletes:	php-pcre < 4:5.2.0
 Obsoletes:	php-pecl-domxml
 Obsoletes:	php-session < 3:4.2.1-2
-#Obsoletes:	php-pcre < 4:5.2.0
 # for the posttrans scriptlet, conflicts because in vserver enviroinment rpm package is not installed.
 Conflicts:	rpm < 4.4.2-0.2
 
@@ -841,7 +841,7 @@
 Summary:	ncurses module for PHP
 Summary(pl):	Moduł ncurses dla PHP
 Group:		Libraries
-Requires(post,preun):	%{name}-cli = %{epoch}:%{version}-%{release}
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 
 %description ncurses
@@ -908,8 +908,8 @@
 Summary:	Process Control extension module for PHP
 Summary(pl):	Moduł Process Control dla PHP
 Group:		Libraries
-Requires(post,preun):	%{name}-program = %{epoch}:%{version}-%{release}
-Requires:	%{name}-program = %{epoch}:%{version}-%{release}
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 
 %description pcntl
 This is a dynamic shared object (DSO) for PHP that will add process
@@ -1110,7 +1110,7 @@
 Summary:	readline extension module for PHP
 Summary(pl):	Moduł readline dla PHP
 Group:		Libraries
-Requires(post,preun):	%{name}-cli = %{epoch}:%{version}-%{release}
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
 
 %description readline
@@ -1490,7 +1490,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-#%patch9 -p1 # TEST OR UPGRADE
+
 cp php.ini-dist php.ini
 %patch10 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
@@ -2926,6 +2926,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.600  2006/11/08 14:35:18  glen
+- drop -reflection.patch (arekm said it was just compile fix)
+- use -cli instead of -program in pncntl deps
+
 Revision 1.599  2006/11/07 20:20:45  qboosh
 - more verbose mime_magic comment
 
================================================================

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