[php-pear-Date-Holidays/el6/master] - remove LICENSE file (not provided by upstream) - rename Date_Holidays to php-pear-Date-Holidays.xm

[Remi Collet]

commit cc6b092b07953bae6155d47b4afadaac82f4e348
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 18:45:23 2010 +0200

    - remove LICENSE file (not provided by upstream)
    - rename Date_Holidays to php-pear-Date-Holidays.xml
    - fix shebang
    - set date.timezone during build

 .gitignore                   |    1 +
 PHP-LICENSE-3.01             |   68 ------------------------------------------
 php-pear-Date-Holidays.patch |   13 ++++++++
 php-pear-Date-Holidays.spec  |   39 ++++++++++++++++--------
 4 files changed, 40 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f655452..8e1c73c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Date_Holidays-0.21.4.tgz
+package.xml
diff --git a/php-pear-Date-Holidays.patch b/php-pear-Date-Holidays.patch
new file mode 100644
index 0000000..fd8c1d8
--- /dev/null
+++ b/php-pear-Date-Holidays.patch
@@ -0,0 +1,13 @@
+--- package.xml.old	1970-01-01 10:13:08.000000000 +0100
++++ package.xml	2010-08-15 18:37:29.000000000 +0200
+@@ -88,7 +88,9 @@
+    <file baseinstalldir="/" md5sum="594ab105ec93d2f34a41d6547a6998e6" name="pear-dh-compile-translationfile" role="script">
+     <tasks:replace from="@PHP-BIN@" to="php_bin" type="pear-config" />
+    </file>
+-   <file baseinstalldir="/" md5sum="0bf8b6c8dda069025496f0179ed6cd93" name="pear-dh-ini2xml" role="script" />
++   <file baseinstalldir="/" md5sum="0bf8b6c8dda069025496f0179ed6cd93" name="pear-dh-ini2xml" role="script">
++    <tasks:replace from="@PHP-BIN@" to="php_bin" type="pear-config" />
++   </file>
+   </dir>
+  </contents>
+  <dependencies>
diff --git a/php-pear-Date-Holidays.spec b/php-pear-Date-Holidays.spec
index e1d0ef0..4697c80 100644
--- a/php-pear-Date-Holidays.spec
+++ b/php-pear-Date-Holidays.spec
@@ -1,22 +1,23 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Date_Holidays
+%global pear_name Date_Holidays
 
 Name:           php-pear-Date-Holidays
 Version:        0.21.4
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        Driver based class to calculate holidays
 
 Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/Date_Holidays
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
+Patch1:         %{name}.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear(PEAR) >= 1.6.0
 Requires:       php-pear(PEAR) php-pear(Date) php-pear(XML_Serializer)
-Requires(hint): php-pear(Console_Getargs)
+Requires:       php-pear(Console_Getargs)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -30,10 +31,16 @@ class can be used to get a holiday's date and title in various languages.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-install -pm 644 -c %{SOURCE1} LICENSE
+
+%patch1
+
+# 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
@@ -44,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
@@ -55,7 +62,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
@@ -64,7 +71,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
@@ -75,15 +82,21 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
 %{_bindir}/pear-dh-*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Date/Holidays*
 
 
 %changelog
+* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.21.4-2
+- remove LICENSE file (not provided by upstream)
+- rename Date_Holidays to php-pear-Date-Holidays.xml
+- fix shebang
+- set date.timezone during build
+
 * Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 0.21.4-1.1
 - Upstream sync