[php-pear-Date-Holidays-USA/el6/master] - rename Date_Holidays_USA.xml to php-pear-Date-Holidays-USA.xml - set date.timezone during build

[Remi Collet]

commit 69d188c3a42f87cfcac34e31f9325102fb1bee58
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 19:10:35 2010 +0200

    - rename Date_Holidays_USA.xml to php-pear-Date-Holidays-USA.xml
    - set date.timezone during build

 .gitignore                      |    1 +
 php-pear-Date-Holidays-USA.spec |   24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60debab..a4cf549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Date_Holidays_USA-0.1.1.tgz
+package.xml
diff --git a/php-pear-Date-Holidays-USA.spec b/php-pear-Date-Holidays-USA.spec
index 060f593..21d0a00 100644
--- a/php-pear-Date-Holidays-USA.spec
+++ b/php-pear-Date-Holidays-USA.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Date_Holidays_USA
+%global pear_name Date_Holidays_USA
 
 Name:           php-pear-Date-Holidays-USA
 Version:        0.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Driver based class to calculate holidays in USA
 
 Group:          Development/Languages
@@ -26,9 +26,13 @@ special celebrations.  This is the driver for calculating holidays in USA.
 
 %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 is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -39,14 +43,14 @@ 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
 
 # Clean up unnecessary files
 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
@@ -55,7 +59,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
@@ -66,13 +70,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Date/Holidays/Driver/*
 
 
 %changelog
+* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.1.1-4
+- rename Date_Holidays_USA.xml to php-pear-Date-Holidays-USA.xml
+- set date.timezone during build
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild