[php-pear-HTTP-Client/el6/master] spec cleanup

[Remi Collet]

commit 6d0b73f332ff542f70791fcd358aafe42da7cde8
Author: remi <fedora at famillecollet.com>
Date:   Wed Aug 18 18:48:55 2010 +0200

    spec cleanup

 .gitignore                              |    1 +
 php-pear-HTTP-Client-1.2.1-md5sum.patch |    4 ++--
 php-pear-HTTP-Client.spec               |   24 ++++++++++++++++--------
 3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae3b340..4e7212d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 HTTP_Client-1.2.1.tgz
+package.xml
diff --git a/php-pear-HTTP-Client-1.2.1-md5sum.patch b/php-pear-HTTP-Client-1.2.1-md5sum.patch
index e78a0fd..9cbfea4 100644
--- a/php-pear-HTTP-Client-1.2.1-md5sum.patch
+++ b/php-pear-HTTP-Client-1.2.1-md5sum.patch
@@ -1,5 +1,5 @@
---- HTTP_Client.xml~	2008-11-08 10:12:08.000000000 -0800
-+++ HTTP_Client.xml	2008-11-08 10:12:15.000000000 -0800
+--- php-pear-HTTP-Client.xml~	2008-11-08 10:12:08.000000000 -0800
++++ php-pear-HTTP-Client.xml	2008-11-08 10:12:15.000000000 -0800
 @@ -36,7 +36,7 @@
     <file baseinstalldir="HTTP" md5sum="4ef1b2315ab7d045e9b6ffabd8afd083" name="Client/CookieManager.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
diff --git a/php-pear-HTTP-Client.spec b/php-pear-HTTP-Client.spec
index 01711dd..b4d3304 100644
--- a/php-pear-HTTP-Client.spec
+++ b/php-pear-HTTP-Client.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name HTTP_Client
+%global pear_name HTTP_Client
 
 Name:           php-pear-HTTP-Client
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Easy way to perform multiple HTTP requests and process their results
 
 Group:          Development/Languages
@@ -28,9 +28,13 @@ interface for performing multiple HTTP requests.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
 cd %{pear_name}-%{version}
+# Package.xml is V2
+mv ../package.xml %{name}.xml
 
 # Fix end of line encodings
 %patch0 -p0 -b .md5sum~
@@ -45,7 +49,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -56,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -65,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -77,11 +81,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/HTTP/Client*
 
 
 %changelog
+* Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.1-4
+- rename HTTP_Client.xml to php-pear-HTTP-Client.xml
+- set date.timezone during build
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild