- updated to 1.10.15

diff --git a/ext-check.patch b/ext-check.patch
index c3f77845a9c4a4074c2e358f442590384c5e157f..1ee45219119f3eaf2380ba6e4e9f04ea3c7ba3b9 100644 (file)
--- a/ext-check.patch
+++ b/ext-check.patch
@@ -2,7 +2,7 @@
 +++ PEAR-1.9.4/usr/share/pear/pearcmd.php      2014-05-14 19:21:53.064418441 +0300
 @@ -45,6 +45,16 @@
  
 +++ PEAR-1.9.4/usr/share/pear/pearcmd.php      2014-05-14 19:21:53.064418441 +0300
 @@ -45,6 +45,16 @@
  

- $pear_package_version = "1.9.4";
+ $pear_package_version = "1.10.15";

  
 +// before trying anything deep, ensure base extensions are present
 +// this avoids debugging problems with bogus error messages, which really are
  
 +// before trying anything deep, ensure base extensions are present
 +// this avoids debugging problems with bogus error messages, which really are

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 0f8d1d39bf3d4efcd974da24e8b0b482d0cdc3ce..8b2449e0edd0881ee11ec20db7c0f2dd2c5d06f9 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -10,17 +10,19 @@
 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.13
-Release:       2
+Version:       1.10.15
+Release:       1

 Epoch:         1
 License:       New BSD License
 Group:         Development/Languages/PHP
 Source0:       https://pear.php.net/get/%{_pearname}-%{version}.tgz
 Epoch:         1
 License:       New BSD License
 Group:         Development/Languages/PHP
 Source0:       https://pear.php.net/get/%{_pearname}-%{version}.tgz

-# Source0-md5: 33a22b40c30b35405f034593590d833e
+# Source0-md5: 07c72ec39bfca48509c90fda5f8bf4ce

 Source1:       https://pear.php.net/get/Console_Getopt-1.4.3.tgz
 # Source1-md5: 78620b71acdf113968c3482845bcbbc2
 Source2:       https://pear.php.net/get/Structures_Graph-1.1.1.tgz
 # Source2-md5: f1be7827074c4f51eb1af245f0f7c5c4
 Source1:       https://pear.php.net/get/Console_Getopt-1.4.3.tgz
 # Source1-md5: 78620b71acdf113968c3482845bcbbc2
 Source2:       https://pear.php.net/get/Structures_Graph-1.1.1.tgz
 # Source2-md5: f1be7827074c4f51eb1af245f0f7c5c4

+Source3:       https://pear.php.net/get/Archive_Tar-1.5.0.tgz
+# Source3-md5: 79bf67d6462beacec5a85f7ae0fa7ae5

 Patch0:                %{name}-sysconfdir.patch
 Patch1:                ext-check.patch
 Patch2:                %{name}-FHS.patch
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                ext-check.patch
 Patch2:                %{name}-FHS.patch


@@ -109,10 +111,10 @@ oraz klasy dla PHP 5:
 
 %prep
 %define __build_dir %{_builddir}/%{_pearname}-%{version}%{?_rc}
 
 %prep
 %define __build_dir %{_builddir}/%{_pearname}-%{version}%{?_rc}

-%define        __php_include_path %{__build_dir}/%{_pearname}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} .tgz):%{__build_dir}/%(basename %{SOURCE2} .tgz)
+%define        __php_include_path %{__build_dir}/%{_pearname}-%{version}%{?_rc}:%{__build_dir}/%(basename %{SOURCE1} .tgz):%{__build_dir}/%(basename %{SOURCE2} .tgz):%{__build_dir}/%(basename %{SOURCE3} .tgz)

 %define __pear php -dmemory_limit=-1 -doutput_buffering=1 -dinclude_path="%__php_include_path" %{__build_dir}/%{_pearname}-%{version}%{?_rc}/scripts/pearcmd.php
 
 %define __pear php -dmemory_limit=-1 -doutput_buffering=1 -dinclude_path="%__php_include_path" %{__build_dir}/%{_pearname}-%{version}%{?_rc}/scripts/pearcmd.php
 

-%setup -q -c -n %{_pearname}-%{version} -a1 -a2
+%setup -q -c -n %{_pearname}-%{version} -a1 -a2 -a3

 %pear_package_setup -z -D -n %{_pearname}-%{version}%{?_rc}
 
 %patch0 -p1
 %pear_package_setup -z -D -n %{_pearname}-%{version}%{?_rc}
 
 %patch0 -p1