- update to 1.4.2

Changed files:
    php-pear-PEAR-rpmvars.patch -> 1.16
    php-pear-PEAR.spec -> 1.82

diff --git a/php-pear-PEAR-rpmvars.patch b/php-pear-PEAR-rpmvars.patch
index 00f31d7c0a11c2d69ebe7005d44c80797fe6238e..dbe5da8aa1ff97e1adfe9719818c0402237ff523 100644 (file)
--- a/php-pear-PEAR-rpmvars.patch
+++ b/php-pear-PEAR-rpmvars.patch
@@ -49,14 +49,10 @@
                          }
                          if (!isset($dep['min']) && !isset($dep['max']) &&
                                !isset($dep['exclude'])) {
-@@ -996,15 +1000,19 @@
-                         $tar->popErrorHandling();
-                         if ($a === null || PEAR::isError($a)) {
-                             // this doesn't have a package.xml version 1.0
--                            $requires[] = 'PEAR::PEAR >= ' .
-+                            $requires[] = 'php-pear-PEAR >= ' .
-                                 $deps['required']['pearinstaller']['min'] . "\n";
-                         }
+--- ./usr/share/pear/PEAR/Command/Package.php~ 2005-10-15 15:16:44.000000000 +0300
++++ ./usr/share/pear/PEAR/Command/Package.php  2005-10-15 15:19:02.000000000 +0300
+@@ -1116,10 +1116,14 @@
+                             $deps['required']['pearinstaller']['min'];
                      }
                      if (count($requires)) {
 -                        $info['extra_headers'] .= 'Requires: ' . implode(', ', $requires) . "\n";
@@ -185,17 +181,17 @@
          if (function_exists('file_get_contents')) {
              fclose($fp);
              $spec_contents = preg_replace('/@([a-z0-9_-]+)@/e', '$info["\1"]',
---- .//usr/share/pear/PEAR/Command/Package.php 2005-09-29 00:26:51.000000000 +0300
-+++ /usr/share/pear/PEAR/Command/Package.php   2005-09-29 00:26:38.000000000 +0300
-@@ -1024,7 +1024,7 @@
-                         $tar->popErrorHandling();
-                         if ($a === null || PEAR::isError($a)) {
-                             // this doesn't have a package.xml version 1.0
--                            $requires[] = 'php-pear-PEAR >= ' .
-+                            $requires[] = 'php-pear-PEAR >= 1:' .
-                                 $deps['required']['pearinstaller']['min'] . "\n";
-                         }
+--- ./usr/share/pear/PEAR/Command/Package.php~ 2005-10-15 15:12:41.000000000 +0300
++++ ./usr/share/pear/PEAR/Command/Package.php  2005-10-15 15:14:30.000000000 +0300
+@@ -1112,7 +1112,7 @@
+                     if ($a === null || PEAR::isError($a)) {
+                         $info['package2xml'] = '';
+                         // this doesn't have a package.xml version 1.0
+-                        $requires[] = 'PEAR::PEAR >= ' .
++                        $requires[] = 'php-pear-PEAR >= 1' .
+                             $deps['required']['pearinstaller']['min'];
                      }
+                     if (count($requires)) {
 --- .//usr/share/pear/PEAR/Command/Package.php 2005-09-29 00:58:11.000000000 +0300
 +++ /usr/share/pear/PEAR/Command/Package.php   2005-09-29 01:06:46.000000000 +0300
 @@ -862,6 +862,9 @@

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index ddd519a07335c4a868b58078a4c79f381329166d..b4622432a54b643df1c12fdb0775c3f9f023d5db 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -6,19 +6,18 @@
 Summary:       %{_pearname} - main PHP PEAR class
 Summary(pl):   %{_pearname} - podstawowa klasa dla PHP PEAR
 Name:          php-pear-%{_pearname}
-Version:       1.4.1
-Release:       3
+Version:       1.4.2
+Release:       1
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 6b39c590203d046f55f207c6c5a7cd18
+# Source0-md5: 15d947df0e18c352a1aeaa7ad655e595
 Source1:       %{name}-template.spec
 Patch0:                %{name}-memory.patch
 Patch1:                %{name}-sysconfdir.patch
 Patch2:                %{name}-rpmpkgname.patch
 Patch3:                %{name}-rpmvars.patch
-Patch4:                http://glen.alkohol.ee/pld/PEAR-makerpm1.patch
 Patch5:                %{name}-cli.patch
 URL:           http://pear.php.net/package/PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -74,8 +73,6 @@ Ta klasa ma w PEAR status: %{_status}.
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
-cd ./%{php_pear_dir}
-%patch4 -p1
 
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v