[php-pear-HTTP-Upload/el6/master] clean spec

[Remi Collet]

commit 6b6990d6b259f1a12a1ac78791ce70c7d948cbcc
Author: remi <fedora at famillecollet.com>
Date:   Wed Aug 18 19:38:02 2010 +0200

    clean spec

 .gitignore                |    1 +
 php-pear-HTTP-Upload.spec |   26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6252239..ba52bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 HTTP_Upload-0.9.1.tgz
+package.xml
diff --git a/php-pear-HTTP-Upload.spec b/php-pear-HTTP-Upload.spec
index 8313d17..41e1f23 100644
--- a/php-pear-HTTP-Upload.spec
+++ b/php-pear-HTTP-Upload.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name HTTP_Upload
+%global pear_name HTTP_Upload
 
 Name:           php-pear-HTTP-Upload
 Version:        0.9.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Secure managment of files submitted via HTML Forms
 
 Group:          Development/Libraries
@@ -34,9 +34,13 @@ from html forms. Features:
 
 %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 still V1 :(
+PHPRC=../php.ini %{__pear} convert ../package.xml %{name}.xml
 
 
 %build
@@ -47,7 +51,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
@@ -66,7 +70,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
@@ -75,7 +79,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
@@ -87,12 +91,18 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %dir %{pear_phpdir}/HTTP
 %{pear_phpdir}/HTTP/Upload.php
 
 
 %changelog
+* Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.9.1-5
+- rename HTTP_Upload.xml to php-pear-HTTP-Upload.xml
+- set date.timezone during build
+- clean define
+- convert old V1 package.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild