- up to 1.3.0-stable

Changed files:
    php-pear-HTML_Select-case.patch -> 1.2
    php-pear-HTML_Select.spec -> 1.28

diff --git a/php-pear-HTML_Select-case.patch b/php-pear-HTML_Select-case.patch
index 8299df1ea896d575269d8265995514a7ac9c728d..e801afafe892b1891726c83ae670fdb0637b77af 100644 (file)
--- a/php-pear-HTML_Select-case.patch
+++ b/php-pear-HTML_Select-case.patch
@@ -1,29 +1,11 @@
---- ./Select.php.org   Thu Feb 26 15:15:04 2004
-+++ ./Select.php       Mon Aug  9 14:57:26 2004
-@@ -157,7 +157,7 @@
-     function loadArray($arr, $values=null)
+--- HTML_Select-1.3.0/usr/share/pear/HTML/Select.php~  2010-08-19 13:44:58.000000000 +0300
++++ HTML_Select-1.3.0/usr/share/pear/HTML/Select.php   2010-08-19 13:45:45.892578488 +0300
+@@ -205,7 +205,7 @@
+     function loadArray($arr, $values = null)
      {
          if (!is_array($arr)) {
--            return new PEAR_ERROR('First argument to HTML_Select::loadArray is not a valid array');
-+            return new PEAR_Error('First argument to HTML_Select::loadArray is not a valid array');
+-            return new PEAR_ERROR(
++            return new PEAR_Error(
+                 'First argument to HTML_Select::loadArray is not a valid array'
+             );
          }
-         if (isset($values)) {
-             $this->setSelectedValues($values);
-@@ -182,7 +182,7 @@
-     function loadValueArray($arr, $values = null)
-     {
-         if (!is_array($arr)) {
--            return new PEAR_ERROR("First argument to HTML_Select::loadArray is not a valid array");
-+            return new PEAR_Error("First argument to HTML_Select::loadArray is not a valid array");
-         }
-         if (isset($values)) {
-             $this->setSelectedValues($values);
-@@ -213,7 +213,7 @@
-         
-         if (!is_object($result) || (strtolower(get_class($result)) != "db_result" && 
-             is_subclass_of($result, "db_result"))) {
--            return new PEAR_ERROR("First argument to HTML_Select::loadDbResult is not a valid DB_result");
-+            return new PEAR_Error("First argument to HTML_Select::loadDbResult is not a valid DB_result");
-         }
-          if (isset($values)) {
-             $this->setSelectedValues($values);

diff --git a/php-pear-HTML_Select.spec b/php-pear-HTML_Select.spec
index 0c82a72ce6a1ff504a8484e13084cb38cf2e27e6..85fa967cea752c1a590bf1d206bdd452eb34a2fe 100644 (file)
--- a/php-pear-HTML_Select.spec
+++ b/php-pear-HTML_Select.spec
@@ -1,18 +1,17 @@
 %include       /usr/lib/rpm/macros.php
 %define                _class          HTML
 %define                _subclass       Select
-%define                _status         beta
+%define                _status         stable
 %define                _pearname       %{_class}_%{_subclass}
-
 Summary:       %{_pearname} - class for generating HTML form select elements
 Summary(pl.UTF-8):     %{_pearname} - klasa do generowania elementów select formularzy HTML
 Name:          php-pear-%{_pearname}
-Version:       1.2.1
-Release:       6
+Version:       1.3.0
+Release:       1
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 9c9b84cc3b1595f6000ef1845829dae8
+# Source0-md5: 7b2a5246c9e9b84a3cd008c80f08125c
 Patch0:                %{name}-case.patch
 URL:           http://pear.php.net/package/HTML_Select/
 BuildRequires: php-pear-PEAR
@@ -20,6 +19,7 @@ BuildRequires:        rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      php-pear
 Requires:      php-pear-HTML_Common >= 1.1
+Requires:      php-pear-PEAR-core >= 1:1.4.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,7 +37,6 @@ Ta klasa ma w PEAR status: %{_status}.
 
 %prep
 %pear_package_setup
-cd ./%{php_pear_dir}/%{_class}
 %patch0 -p1
 
 %install