SPECS: php.spec - ini-search-path.patch resolved upstream

glen glen at pld-linux.org
Fri Nov 3 00:37:59 CET 2006


Author: glen                         Date: Thu Nov  2 23:37:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ini-search-path.patch resolved upstream

---- Files affected:
SPECS:
   php.spec (1.594 -> 1.595) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.594 SPECS/php.spec:1.595
--- SPECS/php.spec:1.594	Thu Nov  2 23:33:16 2006
+++ SPECS/php.spec	Fri Nov  3 00:37:53 2006
@@ -66,7 +66,7 @@
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
-%define	_rel 0.1
+%define	_rel 0.2
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -116,7 +116,6 @@
 Patch31:	%{name}-both-apxs.patch
 Patch32:	%{name}-builddir.patch
 Patch33:	%{name}-zlib-for-getimagesize.patch
-Patch34:	%{name}-ini-search-path.patch
 Patch35:	%{name}-versioning.patch
 Patch36:	%{name}-linkflags-clean.patch
 Patch38:	%{name}-amd64.patch
@@ -366,7 +365,7 @@
 Provides:	%{name}-simplexml = %{epoch}:%{version}-%{release}
 Provides:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	%{name}-standard = %{epoch}:%{version}-%{release}
-Provides:	%{name}-pcre = %{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}
@@ -374,6 +373,7 @@
 Provides:	php5(thread-safety) = %{zend_zts}
 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
 
@@ -1498,7 +1498,6 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
-#%patch34 -p1 # UPDATE
 %{?with_versioning:%patch35 -p1}
 %if "%{_lib}" == "lib64"
 %patch38 -p1
@@ -2909,6 +2908,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.595  2006/11/02 23:37:53  glen
+- ini-search-path.patch resolved upstream
+
 Revision 1.594  2006/11/02 22:33:16  glen
 - hwapi, filepro have been dropped
 - pcre compiled statically as -common depends on it's symbols
================================================================

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



More information about the pld-cvs-commit mailing list