- update to 1.0.0RC2

Changed files:
    php-pear-Net_LDAP-path_fix.patch -> 1.3
    php-pear-Net_LDAP.spec -> 1.28

diff --git a/php-pear-Net_LDAP-path_fix.patch b/php-pear-Net_LDAP-path_fix.patch
index 51a359979b6b249234a2df2a7c1d69117065aa1c..ef6524496e58eecb76361609091b7e268af3dfd6 100644 (file)
--- a/php-pear-Net_LDAP-path_fix.patch
+++ b/php-pear-Net_LDAP-path_fix.patch
@@ -1,13 +1,39 @@
---- php-pear-Net_LDAP-0.6.6/Net_LDAP-0.6.6/LDAP.php~   2004-03-08 12:42:44.000000000 +0100
-+++ php-pear-Net_LDAP-0.6.6/Net_LDAP-0.6.6/LDAP.php    2004-12-05 01:11:50.943301208 +0100
-@@ -26,8 +26,8 @@
- // $Id$
- 
+--- Net/LDAP.php~      2007-07-16 20:25:11.122659476 +0300
++++ Net/LDAP.php       2007-07-16 20:25:50.183551314 +0300
+@@ -23,10 +23,10 @@
+  * Package includes.
+  */
  require_once('PEAR.php');
 -require_once('LDAP/Entry.php');
 -require_once('LDAP/Search.php');
+-require_once('LDAP/Util.php');
+-require_once('LDAP/Filter.php');
 +require_once('Net/LDAP/Entry.php');
 +require_once('Net/LDAP/Search.php');
++require_once('Net/LDAP/Util.php');
++require_once('Net/LDAP/Filter.php');
+ 
+ /**
+  *  Error constants for errors that are not LDAP errors.
+--- Net/LDAP/Entry.php~        2007-07-16 20:26:28.774432368 +0300
++++ Net/LDAP/Entry.php 2007-07-16 20:27:59.226497239 +0300
+@@ -25,7 +25,7 @@
+ // $Id$
+ 
+ require_once("PEAR.php");
+-require_once('Util.php');
++require_once('Net/LDAP/Util.php');
+ 
+ /**
+  * Object representation of a directory entry
+--- Net/LDAP/Filter.php~       2007-07-16 20:26:28.784432596 +0300
++++ Net/LDAP/Filter.php        2007-07-16 20:28:29.607190716 +0300
+@@ -25,7 +25,7 @@
+ // $Id$
+ 
+ require_once("PEAR.php");
+-require_once('Util.php');
++require_once('Net/LDAP/Util.php');
  
  /**
-  * Net_LDAP - manipulate LDAP servers the right way!
+ * Object representation of a part of a LDAP filter.

diff --git a/php-pear-Net_LDAP.spec b/php-pear-Net_LDAP.spec
index aa4c776660b7b684fc318271a6e83489a0793a1d..10fd0e91f1a551f838bc96efe49df6f6ccace116 100644 (file)
--- a/php-pear-Net_LDAP.spec
+++ b/php-pear-Net_LDAP.spec
@@ -4,18 +4,19 @@
 %define                _status         beta
 %define                _pearname       %{_class}_%{_subclass}
 
+%define                _rc     RC2
+%define                _rel    1
 Summary:       %{_pearname} - OO interface for searching and manipulating LDAP-entries
 Summary(pl.UTF-8):     %{_pearname} - obiektowy interfejs do przeszukiwania i modyfikowania wpisów LDAP
 Name:          php-pear-%{_pearname}
-Version:       0.6.6
-Release:       4
+Version:       1.0.0
+Release:       0.%{_rc}.%{_rel}
 Epoch:         0
 License:       LGPL
 Group:         Development/Languages/PHP
-Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: d19f11c671122d0ff30928d86a868096
+Source0:       http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz
+# Source0-md5: 31782acbb3c2def62ec281fc78069f16
 Patch0:                %{name}-path_fix.patch
-Patch1:                %{name}-bug-8286.patch
 URL:           http://pear.php.net/package/Net_LDAP/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -63,15 +64,8 @@ Testy dla PEAR::%{_pearname}.
 %prep
 %pear_package_setup
 
-rm -f docs/%{_pearname}/LICENSE # GPL V2.1
-
-install -d ./%{php_pear_dir}/tests/%{_pearname}
-mv docs/%{_pearname}/tests/* ./%{php_pear_dir}/tests/%{_pearname}
-rmdir docs/%{_pearname}/tests
-
-%patch1 -p1
 cd ./%{php_pear_dir}/%{_class}
-%patch0 -p2
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT