[php-pear-XML-RPC2] update to 1.1.1 - major version, switch from curl to HTTP_Request2

[Remi Collet]

commit 40faecd8ada643b8823cd346b95c868570a3bfd0
Author: remi <fedora at famillecollet.com>
Date:   Sat Jul 2 10:40:41 2011 +0200

    update to 1.1.1 - major version, switch from curl to HTTP_Request2

 .gitignore             |    3 +
 XML_RPC2.patch         |  158 ------------------------------------------------
 php-pear-XML-RPC2.spec |   32 ++++------
 sources                |    2 +-
 4 files changed, 18 insertions(+), 177 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac2ae65..5b77f12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*~
+package-*.xml
 /XML_RPC2-1.0.6.tgz
+/XML_RPC2-1.1.1.tgz
diff --git a/php-pear-XML-RPC2.spec b/php-pear-XML-RPC2.spec
index 86130d8..f011204 100644
--- a/php-pear-XML-RPC2.spec
+++ b/php-pear-XML-RPC2.spec
@@ -2,7 +2,7 @@
 %global pear_name XML_RPC2
 
 Name:           php-pear-XML-RPC2
-Version:        1.0.6
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        XML-RPC client/server library
 
@@ -11,9 +11,6 @@ License:        LGPLv2+
 URL:            http://pear.php.net/package/XML_RPC2
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-# See http://pear.php.net/bugs/18268
-Patch0:         %{pear_name}.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
@@ -23,12 +20,13 @@ Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
 Requires:       php-xml
 Requires:       php-mbstring
-Requires:       php-pear(PEAR) 
 Requires:       php-pear(Cache_Lite) >= 1.6.0
+Requires:       php-pear(HTTP_Request2) >= 0.6.0
 
 # Tests are only run with rpmbuild --with tests
 # Can't be run in mock / koji because of network / dns
-%global with_test       %{?_with_test:1}%{!?_with_test:0}
+%global with_tests       %{?_with_tests:1}%{!?_with_tests:0}
+
 
 %description
 XML_RPC2 is a pear package providing XML_RPC client and server services.
@@ -39,6 +37,7 @@ exposes the methods exported by the server. As a server library, XML_RPC2
 is capable of exposing methods from a class or object instance, seamlessly
 exporting local methods as remotely callable procedures.
 
+
 %prep
 %setup -q -c
 # Create a "localized" php.ini to avoid build warning
@@ -49,8 +48,6 @@ cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
 
-%patch0 -p1 -b .orig
-
 
 %build
 cd %{pear_name}-%{version}
@@ -58,14 +55,9 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
-
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -92,7 +84,7 @@ fi
 
 %check
 cd %{pear_name}-%{version}
-%if %{with_test}
+%if %{with_tests}
 PHPRC=../php.ini %{__pear} \
    run-tests \
    --recur \
@@ -100,13 +92,13 @@ PHPRC=../php.ini %{__pear} \
    tests | tee ../tests.log
 grep "FAILED TESTS" ../tests.log && exit 1
 %else
-echo 'Test suite disabled (missing "--with test" option)'
+echo 'Test suite disabled (missing "--with tests" option)'
 %endif
 
 
 %files
 %defattr(-,root,root,-)
-%doc docdir/*
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/XML
 %{pear_testdir}/%{pear_name}
@@ -116,6 +108,10 @@ echo 'Test suite disabled (missing "--with test" option)'
 
 
 %changelog
+* Sat Jul  2 2011 Remi Collet <Fedora at FamilleCollet.com> 1.1.1-1
+- Version 1.1.1 (stable) - API 1.0.5 (stable)
+- move doc in /usr/share/doc/pear
+
 * Sun Feb 13 2011 Remi Collet <Fedora at FamilleCollet.com> 1.0.6-1
 - initial RPM (from generated and cleaned spec)
 
diff --git a/sources b/sources
index 960ae77..c739009 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-236ef652139be789ca4c4329c0e27631  XML_RPC2-1.0.6.tgz
+40fb170ef74008c522df3ab809ce7abc  XML_RPC2-1.1.1.tgz