[php-pear-Net-URL2] update to 2.0.0

[Remi Collet]

commit 7428050fb8a60eea697ef9d9aee501f7f48d0763
Author: remi <fedora at famillecollet.com>
Date:   Sun Oct 23 08:32:08 2011 +0200

    update to 2.0.0

 .gitignore              |    2 +
 php-pear-Net-URL2.patch |   18 +++++++++++++++
 php-pear-Net-URL2.spec  |   54 +++++++++++++++++++++++++++++++++++-----------
 sources                 |    2 +-
 4 files changed, 62 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17459f4..6a05aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 package-*.xml
+*spec~
 Net_URL2-0.3.1.tgz
+/Net_URL2-2.0.0.tgz
diff --git a/php-pear-Net-URL2.patch b/php-pear-Net-URL2.patch
new file mode 100644
index 0000000..9be7d88
--- /dev/null
+++ b/php-pear-Net-URL2.patch
@@ -0,0 +1,18 @@
+--- package.xml.orig	2011-10-22 19:15:58.000000000 +0200
++++ package.xml	2011-10-22 19:21:44.000000000 +0200
+@@ -36,9 +36,13 @@
+   <dir name="/">
+    <file baseinstalldir="Net" md5sum="587a224d39fbffa47cacb9fb67b51da1" name="docs/example.php" role="doc" />
+    <file baseinstalldir="Net" md5sum="ea8b73061588566519fd0e55a230f2a6" name="docs/6470.php" role="doc" />
+-   <file md5sum="637af3fb6a678dd1665ad13f2ec8c7c8" name="tests/Net/URL2Test.php" role="test" />
++   <file md5sum="637af3fb6a678dd1665ad13f2ec8c7c8" name="tests/Net/URL2Test.php" role="test">
++         <tasks:replace from="@package_version@" to="version" type="package-info" /> 
++   </file>
+    <file md5sum="e25e538f2e5b06788f1e71333c9498bc" name="tests/AllTests.php" role="test" />
+-   <file md5sum="294c727633c67bd963151b9d5e7ab801" name="Net/URL2.php" role="php" />
++   <file md5sum="294c727633c67bd963151b9d5e7ab801" name="Net/URL2.php" role="php">
++         <tasks:replace from="@package_version@" to="version" type="package-info" /> 
++   </file>
+   </dir>
+  </contents>
+  <dependencies>
diff --git a/php-pear-Net-URL2.spec b/php-pear-Net-URL2.spec
index fe12281..1117563 100644
--- a/php-pear-Net-URL2.spec
+++ b/php-pear-Net-URL2.spec
@@ -1,19 +1,28 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Net_URL2
+%global pear_name   Net_URL2
+%global with_tests  %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           php-pear-Net-URL2
-Version:        0.3.1
-Release:        4%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Class for parsing and handling URL
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Net_URL2
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://pear.php.net/bugs/bug.php?id=18921
+Patch0:         %{name}.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+%if %{with_tests}
+BuildRequires:  php-phpunit-PHPUnit
+%endif
+
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -24,11 +33,11 @@ Requires:       php-pear(PEAR)
 Provides parsing of URLs into their constituent parts (scheme, host, path
 etc.), URL generation, and resolving of relative URLs.
 
+
 %prep
 %setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
+
+%patch0
 
 cd %{pear_name}-%{version}
 # Package is V2
@@ -41,20 +50,34 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+
+
+%check
+%if %{with_tests}
+# test suite cannot run in mock (use network)
+# Version 2.0.0 : OK (17 tests, 65 assertions)
+cd %{buildroot}%{pear_testdir}/%{pear_name}/tests
+phpunit \
+   -d date.timezone=UTC \
+   -d include_path=.:%{buildroot}%{pear_phpdir}:%{pear_phpdir}: \
+   AllTests.php
+%else
+echo 'Test suite disabled (missing "--with tests" option)'
+%endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -73,9 +96,14 @@ fi
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
+%{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat Oct 22 2011 Remi Collet <remi at fedoraproject.org> - 2.0.0-1
+- Version 2.0.0 (stable) - API 2.0.0 (stable)
+- add tests option to run tests during rpmbuild
+
 * Mon Apr 18 2011 Remi Collet <Fedora at FamilleCollet.com> 0.3.1-4
 - doc in /usr/share/doc/pear
 - set date.timezone during build
diff --git a/sources b/sources
index 79e4d9a..a89a74b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0ed15223a94c3a938846b90ae97ffd5  Net_URL2-0.3.1.tgz
+4ec4d47bc517b6b9caa7f2dd753d6424  Net_URL2-2.0.0.tgz