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

[Remi Collet]

commit cd668ef48243483f6ed875b73dfb1b024143cbf8
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 18:11:16 2010 +0200

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

 .gitignore         |    1 +
 php-pear-Date.spec |   26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5faf6cd..4256a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Date-1.4.7.tgz
+package.xml
diff --git a/php-pear-Date.spec b/php-pear-Date.spec
index c00f860..5b14c9f 100644
--- a/php-pear-Date.spec
+++ b/php-pear-Date.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define ClassName Date
+%global ClassName Date
 
 Name:           php-pear-Date
 Version:        1.4.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Date and Time Zone Classes
 
 Group:          Development/Libraries
@@ -31,9 +31,13 @@ formats.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
 cd %{ClassName}-%{version}
+# Package is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -44,7 +48,7 @@ cd %{ClassName}-%{version}
 %install
 cd %{ClassName}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{ClassName}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -55,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 # Fix end of line encoding
 sed -i 's/\r//' docdir/%{ClassName}/docs/TODO
@@ -67,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{ClassName}.xml >/dev/null ||:
+    %{pear_xmldir}/%{name}.xml >/dev/null ||:
 
 %postun
 if [ "$1" -eq "0" ]; then
@@ -79,13 +83,17 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
-%{pear_xmldir}/%{ClassName}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
 %{pear_phpdir}/Date.php
 
 
 %changelog
+* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.4.7-5
+- rename Date.xml to php-pear-Date.xml
+- set date.timezone during build
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -99,7 +107,7 @@ fi
 * Thu Nov 23 2006 Christopher Stone <chris.stone at gmail.com> 1.4.7-1
 - Upstream Sync
 - Fix end-of-line encoding for TODO
-- Remove docs dir from %doc
+- Remove docs dir from %%doc
 
 * Fri Jun 30 2006 Christopher Stone <chris.stone at gmail.com> 1.4.6-1
 - Initial Release