[php-pear-Image-Canvas/el6/master] clean spec

[Remi Collet]

commit 3d6cc964c77f983a6fbd7f980641a1938f0170e2
Author: remi <fedora at famillecollet.com>
Date:   Fri Aug 20 17:57:03 2010 +0200

    clean spec

 php-pear-Image-Canvas.spec |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/php-pear-Image-Canvas.spec b/php-pear-Image-Canvas.spec
index a25c530..6c50332 100644
--- a/php-pear-Image-Canvas.spec
+++ b/php-pear-Image-Canvas.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Image_Canvas
+%global pear_name Image_Canvas
 
 Name:           php-pear-Image-Canvas
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common interface to image drawing
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@ Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.8.1
+BuildRequires:  php-pear(PEAR) >= 1.8.1
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Image_Color) >= 1.0.0
 #Requires(hint): php-pecl-pdflib
@@ -28,9 +28,13 @@ image source code independent on the library used.
 
 %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
 
 
 %build
@@ -41,7 +45,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
@@ -53,7 +57,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}
 
 # Create a README.Fedora file for PDF usage
 cat > README.Fedora << EOF
@@ -70,7 +74,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
@@ -83,13 +87,18 @@ fi
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
 %doc %{pear_name}-%{version}/README.Fedora
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Image/Canvas*
 
 
 %changelog
+* Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.3.2-2
+- rename Image_Canvas.xml to php-pear-Image-Canvas.xml
+- set date.timezone during build
+- clean define
+
 * Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 0.3.2-1
 - Upstream sync
 - Add new %%{datadir}