X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=f7f8bcbcda5d9810587107ff4dd35d8448886c9f;hb=b12c324fc065c0605c66b27bb039bf2f729a21a9;hp=acf692d981487909d2c6027aeb15df173b88c596;hpb=269fc328ab5a7df197686e851c28e92546e2178f;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index acf692d..f7f8bcb 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define		magic_mime	/usr/share/misc/magic.mime
 %endif
 
-%define		rel	33
+%define		rel	40
 %define		orgname	php
 %define		ver_suffix 52
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -237,7 +237,7 @@ Patch314:	php-5.3.6-39199.patch
 Patch355:	php-5.3.7-bug-55323.patch
 # Bug-323016 CVE-2012-0831
 Patch402:	php-5.2.17-bug-323016.patch
-URL:		https://code.google.com/p/php52-backports/
+URL:		https://code.google.com/archive/p/php52-backports/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
 BuildRequires:	autoconf >= 2.53
@@ -395,7 +395,6 @@ PHP - це мова написання скриптів, що вбудовуют
 Summary:	PHP DSO module for Apache 1.3.x
 Summary(pl.UTF-8):	Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
 Group:		Development/Languages/PHP
-Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
@@ -486,7 +485,20 @@ Summary:	/usr/bin/php symlink
 Summary(pl.UTF-8):	Dowiązanie symboliczne /usr/bin/php
 Group:		Development/Languages/PHP
 Requires:	%{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes:	/usr/bin/php
+Obsoletes:	php-program < 4:5.3.28-7
+Obsoletes:	php4-program < 3:5
+Obsoletes:	php53-program < 4:5.4
+Obsoletes:	php54-program < 4:5.5
+Obsoletes:	php55-program < 4:5.6
+Obsoletes:	php56-program < 4:7
+Obsoletes:	php70-program < 4:7.1
+Obsoletes:	php71-program < 4:7.2
+Obsoletes:	php72-program < 4:7.3
+Obsoletes:	php73-program < 4:7.4
+Obsoletes:	php74-program < 4:8
+Obsoletes:	php80-program < 4:8.1
+Obsoletes:	php81-program < 4:8.2
+Obsoletes:	php82-program < 4:8.3
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -599,16 +611,20 @@ Requires:	libtool
 %{?with_pcre:Requires:	pcre-devel >= 6.6}
 Requires:	shtool
 Obsoletes:	php-devel
-Obsoletes:	php-pear-devel
-Obsoletes:	php4-devel
-Obsoletes:	php53-devel
-Obsoletes:	php54-devel
-Obsoletes:	php55-devel
-Obsoletes:	php56-devel
-Obsoletes:	php70-devel
-Obsoletes:	php71-devel
-Obsoletes:	php72-devel
-Obsoletes:	php73-devel
+Obsoletes:	php-pear-devel < 3:4.3.0-1
+Obsoletes:	php4-devel < 3:5
+Obsoletes:	php53-devel < 4:5.4
+Obsoletes:	php54-devel < 4:5.5
+Obsoletes:	php55-devel < 4:5.6
+Obsoletes:	php56-devel < 4:7
+Obsoletes:	php70-devel < 4:7.1
+Obsoletes:	php71-devel < 4:7.2
+Obsoletes:	php72-devel < 4:7.3
+Obsoletes:	php73-devel < 4:7.4
+Obsoletes:	php74-devel < 4:8
+Obsoletes:	php80-devel < 4:8.1
+Obsoletes:	php81-devel < 4:8.2
+Obsoletes:	php82-devel < 4:8.3
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -810,7 +826,7 @@ URL:		http://www.php.net/manual/en/book.filter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	php(filter)
-Obsoletes:	php-pecl-filter
+Obsoletes:	php-pecl-filter < 0.12
 
 %description filter
 We all know that you should always check input variables, but PHP does
@@ -1235,7 +1251,7 @@ URL:		http://www.php.net/manual/en/book.pdo.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(pdo)
-Obsoletes:	php-pecl-PDO
+Obsoletes:	php-pecl-PDO < 1.1
 
 %description pdo
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1269,7 +1285,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-firebird.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-firebird)
-Obsoletes:	php-pecl-PDO_FIREBIRD
+Obsoletes:	php-pecl-PDO_FIREBIRD < 0.3
 
 %description pdo-firebird
 This is a dynamic shared object (DSO) for PHP that will add PDO
@@ -1287,7 +1303,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-mysql.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-mysql)
-Obsoletes:	php-pecl-PDO_MYSQL
+Obsoletes:	php-pecl-PDO_MYSQL < 1.1
 
 %description pdo-mysql
 This is a dynamic shared object (DSO) for PHP that will add PDO MySQL
@@ -1305,7 +1321,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-oci.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-oci)
-Obsoletes:	php-pecl-PDO_OCI
+Obsoletes:	php-pecl-PDO_OCI < 1.1
 
 %description pdo-oci
 This is a dynamic shared object (DSO) for PHP that will add PDO Oracle
@@ -1323,7 +1339,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-odbc.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-odbc)
-Obsoletes:	php-pecl-PDO_ODBC
+Obsoletes:	php-pecl-PDO_ODBC < 1.1
 
 %description pdo-odbc
 This is a dynamic shared object (DSO) for PHP that will add PDO ODBC
@@ -1359,7 +1375,7 @@ URL:		http://www.php.net/manual/en/ref.pdo-sqlite.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:	php(pdo-sqlite)
-Obsoletes:	php-pecl-PDO_SQLITE
+Obsoletes:	php-pecl-PDO_SQLITE < 1.1
 
 %description pdo-sqlite
 This is a dynamic shared object (DSO) for PHP that will add PDO SQLite
@@ -1799,7 +1815,7 @@ Group:		Libraries
 URL:		http://www.php.net/manual/en/book.xmlwriter.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(xmlwriter)
-Obsoletes:	php-pecl-xmlwriter
+Obsoletes:	php-pecl-xmlwriter < 2.1
 
 %description xmlwriter
 This extension wraps the libxml xmlWriter API. Represents a writer
@@ -1926,7 +1942,7 @@ done
 
 # mysql default charset for mysql/mysql/pdo-mysql extensions
 %patch36 -p1
-%patch37 -p0
+%patch37 -p1
 %patch38 -p0
 
 %patch39 -p1
@@ -1956,10 +1972,10 @@ done
 %patch57 -p1
 %patch58 -p4
 %patch59 -p1
-%patch60 -p4
+%patch60 -p1
 %patch61 -p1
 %{?with_system_libzip:%patch65 -p1}
-%patch66 -p2
+%patch66 -p1
 %patch67 -p1
 %patch69 -p4
 %patch70 -p1
@@ -2023,6 +2039,9 @@ mv sapi/cli/tests/022.phpt{,.broken}
 
 sh -xe %{_sourcedir}/skip-tests.sh
 
+# make colliding symbol static
+%{__sed} -i -e 's/^char \*yytext/static &/' Zend/zend_{ini,language}_scanner.c
+
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
 if [ $API != %{php_api_version} ]; then
@@ -2111,7 +2130,6 @@ for sapi in $sapis; do
 	--with-system-tzdata \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	%{?with_zts:--enable-maintainer-zts} \
-	%{?with_suhosin:--enable-suhosin} \
 	%{?with_zend_multibyte:--enable-zend-multibyte} \
 	--enable-inline-optimization \
 	--enable-bcmath=shared \
@@ -2456,7 +2474,7 @@ for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
 done
 sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
 
-# as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h
+# as a result of ext/pcre/pcrelib removal in prep, ext/pcre/php_pcre.h
 # isn't installed by install-headers make target, we do it manually here.
 # this header file is required by e.g. filter PECL extension
 install -D ext/pcre/php_pcre.h $RPM_BUILD_ROOT%{_includedir}/php/ext/pcre/php_pcre.h