- merged 1.10.9 from PLD

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 6716fcabae9347e2a58b738d0b1ab20b0f75d4cd..395c14631812ff28bce35daea371c412407a7774 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -12,21 +12,21 @@
 Summary:       PEAR Base System
 Summary(pl.UTF-8):     Podstawowy system PEAR
 Name:          php-pear-%{_pearname}
 Summary:       PEAR Base System
 Summary(pl.UTF-8):     Podstawowy system PEAR
 Name:          php-pear-%{_pearname}

-Version:       1.10.5
+Version:       1.10.9

 Release:       1
 Epoch:         1
 License:       New BSD License
 Group:         Development/Languages/PHP
 Release:       1
 Epoch:         1
 License:       New BSD License
 Group:         Development/Languages/PHP

-Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: cf8bacd129b8deafc1d1a931aa31f74f
-Source1:       http://pear.php.net/get/Console_Getopt-1.4.1.tgz
+Source0:       https://pear.php.net/get/%{_pearname}-%{version}.tgz
+# Source0-md5: 5015d15753c5b44ac694a6906a5d8c15
+Source1:       https://pear.php.net/get/Console_Getopt-1.4.1.tgz

 # Source1-md5: a95c86528f910562772274eefb90ca2c
 # Source1-md5: a95c86528f910562772274eefb90ca2c

-Source2:       http://pear.php.net/get/Structures_Graph-1.1.1.tgz
+Source2:       https://pear.php.net/get/Structures_Graph-1.1.1.tgz

 # Source2-md5: f1be7827074c4f51eb1af245f0f7c5c4
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                ext-check.patch
 Patch2:                %{name}-FHS.patch
 # Source2-md5: f1be7827074c4f51eb1af245f0f7c5c4
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                ext-check.patch
 Patch2:                %{name}-FHS.patch

-URL:           http://pear.php.net/package/PEAR
+URL:           https://pear.php.net/package/PEAR

 BuildRequires: php72-pcre
 BuildRequires: php72-xml
 BuildRequires: /usr/bin/php72
 BuildRequires: php72-pcre
 BuildRequires: php72-xml
 BuildRequires: /usr/bin/php72


@@ -39,10 +39,10 @@ Requires:   php(pcre)
 Requires:      php(xml)
 Requires:      php(zlib)
 Requires:      php-pear >= 4:1.2-1
 Requires:      php(xml)
 Requires:      php(zlib)
 Requires:      php-pear >= 4:1.2-1

-Requires:      php-pear-Archive_Tar >= 1.3.11
-Requires:      php-pear-Console_Getopt >= 1.2.3
-Requires:      php-pear-Structures_Graph >= 1.0.4
-Requires:      php-pear-XML_Util >= 1.2.3
+Requires:      php-pear-Archive_Tar >= 1.4.0
+Requires:      php-pear-Console_Getopt >= 1.4.1
+Requires:      php-pear-Structures_Graph >= 1.1.0
+Requires:      php-pear-XML_Util >= 1.3.0

 Requires:      rpm-whiteout
 Suggests:      php-pear-Net_FTP
 Obsoletes:     php-pear-PEAR-Command
 Requires:      rpm-whiteout
 Suggests:      php-pear-Net_FTP
 Obsoletes:     php-pear-PEAR-Command


@@ -98,8 +98,6 @@ Requires:     php(core) >= %{php_min_version}
 %description core
 This package includes PEAR core classes:
 - PEAR class and PEAR_Error
 %description core
 This package includes PEAR core classes:
 - PEAR class and PEAR_Error

-- System
-- OS_Guess

 and classes for PHP 5:
 - PEAR_ErrorStack and PEAR_Exception
 
 and classes for PHP 5:
 - PEAR_ErrorStack and PEAR_Exception
 


@@ -188,6 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_pear_dir}/pearcmd.php
 %{php_pear_dir}/peclcmd.php
 %{php_pear_dir}/PEAR/*
 %{php_pear_dir}/pearcmd.php
 %{php_pear_dir}/peclcmd.php
 %{php_pear_dir}/PEAR/*

+%{php_pear_dir}/OS
+%{php_pear_dir}/System.php

 
 # in -core subpackage
 %exclude %{php_pear_dir}/PEAR/ErrorStack.php
 
 # in -core subpackage
 %exclude %{php_pear_dir}/PEAR/ErrorStack.php


@@ -198,8 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %files core
 %defattr(644,root,root,755)
 %{php_pear_dir}/PEAR.php
 %files core
 %defattr(644,root,root,755)
 %{php_pear_dir}/PEAR.php

-%{php_pear_dir}/System.php
-%{php_pear_dir}/OS

 %dir %{php_pear_dir}/PEAR
 %{php_pear_dir}/PEAR/ErrorStack.php
 %{php_pear_dir}/PEAR/Exception.php
 %dir %{php_pear_dir}/PEAR
 %{php_pear_dir}/PEAR/ErrorStack.php
 %{php_pear_dir}/PEAR/Exception.php