commit 2991dcebf354f20b7a9ad3add9dbbc03a0b3b1dd
Author: Jakub Bogusz <[email protected]>
Date:   Sun Sep 25 19:47:55 2022 +0200

    Updated URL, more versioned Obsoletes
    
    Cherry picked 7940efe7d66c39fbdf739188ffaab64f3fd19559
    
    Co-authored-by: Elan Ruusamäe <[email protected]>

 php.spec | 68 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/php.spec b/php.spec
index 85ccfea..e474ef3 100644
--- a/php.spec
+++ b/php.spec
@@ -229,7 +229,7 @@ Patch72:    mysqli-err.patch
 Patch73:       openssl.patch
 Patch74:       php-icu64.patch
 Patch75:       icu69.patch
-URL:           http://www.php.net/
+URL:           https://www.php.net/
 %{?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.59
@@ -499,18 +499,18 @@ Summary(pl.UTF-8):        Dowiązanie symboliczne 
/usr/bin/php
 Group:         Development/Languages/PHP
 Requires:      %{name}-cli = %{epoch}:%{version}-%{release}
 Obsoletes:     php-program < 4:5.3.28-7
-Obsoletes:     php4-program
-Obsoletes:     php52-program
-Obsoletes:     php53-program
-Obsoletes:     php55-program
-Obsoletes:     php56-program
-Obsoletes:     php70-program
-Obsoletes:     php71-program
-Obsoletes:     php72-program
-Obsoletes:     php73-program
-Obsoletes:     php74-program
-Obsoletes:     php80-program
-Obsoletes:     php81-program
+Obsoletes:     php4-program < 3:5
+Obsoletes:     php52-program < 4:5.3
+Obsoletes:     php53-program < 4:5.4
+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
 
 %description program
 Package providing /usr/bin/php symlink to PHP CLI.
@@ -609,19 +609,19 @@ Requires: libtool
 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:     php55-devel
-Obsoletes:     php56-devel
-Obsoletes:     php70-devel
-Obsoletes:     php71-devel
-Obsoletes:     php72-devel
-Obsoletes:     php73-devel
-Obsoletes:     php74-devel
-Obsoletes:     php80-devel
-Obsoletes:     php81-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:     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
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -849,7 +849,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
@@ -1280,7 +1280,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
@@ -1315,7 +1315,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-firebird)
 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
@@ -1335,7 +1335,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-mysql)
 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
@@ -1354,7 +1354,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-oci)
 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
@@ -1373,7 +1373,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-odbc)
 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
@@ -1411,7 +1411,7 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pdo = %{epoch}:%{version}-%{release}
 Provides:      php(pdo-sqlite)
 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
@@ -1852,7 +1852,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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/2991dcebf354f20b7a9ad3add9dbbc03a0b3b1dd

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to