rel 2

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 9d566a66f4a4e256f0e69316efbe4a9670e677ee..aff1a1d5e5f10e5149e39eece6d721af3860a0c7 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -149,7 +149,7 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       7.4.12
+Version:       7.4.32
 Release:       2
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -157,8 +157,8 @@ Epoch:              4
 # TSRM is licensed under BSD
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
-Source0:       https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: adc8be777dff588732b18319dbad2593
+Source0:       https://www.php.net/distributions/%{orgname}-%{version}.tar.xz
+# Source0-md5: 9fae22a9dc7f3e9fe26dd2f8dc94d03e
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
@@ -189,7 +189,6 @@ Patch24:    %{orgname}-zlib-for-getimagesize.patch
 Patch25:       %{orgname}-stupidapache_version.patch
 Patch27:       %{orgname}-config-dir.patch
 Patch29:       %{orgname}-fcgi-graceful.patch
-Patch31:       %{orgname}-fcgi-error_log-no-newlines.patch
 Patch39:       %{orgname}-use-prog_sendmail.patch
 Patch41:       %{orgname}-fpm-config.patch
 Patch43:       %{orgname}-silent-session-cleanup.patch
@@ -203,7 +202,8 @@ Patch67:    mysql-lib-ver-mismatch.patch
 # https://bugs.php.net/bug.php?id=68344
 Patch68:       php-mysql-ssl-context.patch
 Patch71:       libdb-info.patch
-URL:           http://php.net/
+Patch72:       openssl.patch
+URL:           https://www.php.net/
 %{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires:    Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
 BuildRequires: autoconf >= 2.59
@@ -463,10 +463,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}
-%if "%_rpmversion" != "4.16.0"
-Obsoletes:     /usr/bin/php
-%endif
 Obsoletes:     php-program < 4:5.3.28-7
+Obsoletes:     php4-program < 3:5
+Obsoletes:     php52-program < 4:5.3
+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:     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.
@@ -614,17 +624,20 @@ Requires: pcre2-8-devel >= 10.30
 Requires:      shtool
 Provides:      php-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     php-devel
-Obsoletes:     php-pear-devel
-Obsoletes:     php4-devel
-Obsoletes:     php52-devel
-Obsoletes:     php53-devel
-Obsoletes:     php54-devel
-Obsoletes:     php55-devel
-Obsoletes:     php56-devel
-Obsoletes:     php70-devel
-Obsoletes:     php71-devel
-Obsoletes:     php73-devel
-Obsoletes:     php80-devel
+Obsoletes:     php-pear-devel < 3:4.3.0-1
+Obsoletes:     php4-devel < 3:5
+Obsoletes:     php52-devel < 4:5.3
+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:     php80-devel < 4:8.0
+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.
@@ -883,7 +896,7 @@ Requires:   %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:      php(filter)
 Obsoletes:     php-filter < 4:5.3.28-7
-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
@@ -1255,7 +1268,7 @@ Requires: %{name}-spl = %{epoch}:%{version}-%{release}
 Provides:      %{name}(PDO_API) = %{php_pdo_api_version}
 Provides:      php(pdo)
 Obsoletes:     php-pdo < 4:5.3.28-7
-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
@@ -1292,7 +1305,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-firebird)
 Provides:      php(pdo_firebird)
 Obsoletes:     php-pdo-firebird < 4:5.3.28-7
-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
@@ -1313,7 +1326,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-mysql)
 Provides:      php(pdo_mysql)
 Obsoletes:     php-pdo-mysql < 4:5.3.28-7
-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
@@ -1333,7 +1346,7 @@ URL:              http://php.net/manual/en/ref.pdo-oci.php
 Provides:      php(pdo-oci)
 Provides:      php(pdo_oci)
 Obsoletes:     php-pdo-oci < 4:5.3.28-7
-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
@@ -1353,7 +1366,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-odbc)
 Provides:      php(pdo_odbc)
 Obsoletes:     php-pdo-odbc < 4:5.3.28-7
-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
@@ -1393,7 +1406,7 @@ Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-sqlite)
 Provides:      php(pdo_sqlite)
 Obsoletes:     php-pdo-sqlite < 4:5.3.28-7
-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
@@ -1801,7 +1814,7 @@ Group:            Libraries
 URL:           http://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
 Obsoletes:     php-xmlwriter < 4:5.3.28-7
 
 %description xmlwriter
@@ -1890,7 +1903,6 @@ cp -p php.ini-production php.ini
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
-%patch31 -p1
 %patch39 -p1
 %patch41 -p1
 %patch43 -p1
@@ -1906,6 +1918,7 @@ cp -p php.ini-production php.ini
 %patch67 -p1
 #%patch68 -p1 DROP or update to 7.0 APIs
 %patch71 -p1
+%patch72 -p1
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
       ext/ext_skel.php \
@@ -3032,7 +3045,7 @@ fi
 %if %{with pdo_oci}
 %files oci8
 %defattr(644,root,root,755)
-%doc ext/oci8/{CREDITS,README}
+%doc ext/oci8/{CREDITS,README.md}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_oci8.ini
 %attr(755,root,root) %{php_extensiondir}/oci8.so
 %endif