[php-pear-Payment-Process] clean spec

[Remi Collet]

commit 65d5b7c446da26eb34faa9cb0192ffd428898859
Author: remi <fedora at famillecollet.com>
Date:   Tue Aug 31 18:18:07 2010 +0200

    clean spec

 .gitignore                    |    1 +
 php-pear-Payment-Process.spec |   43 ++++++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b1fb38..8e23b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Payment_Process-0.6.6.tgz
+package.xml
diff --git a/php-pear-Payment-Process.spec b/php-pear-Payment-Process.spec
index 0267a9b..93258a1 100644
--- a/php-pear-Payment-Process.spec
+++ b/php-pear-Payment-Process.spec
@@ -1,15 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define ClassName Payment_Process
+%global pear_name Payment_Process
 
 Name:           php-pear-Payment-Process
 Version:        0.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Unified payment processor
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Payment_Process
-Source0:        http://pear.php.net/get/%{ClassName}-%{version}.tgz
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,7 +21,7 @@ Requires(hint): php-pear(XML_Parser) >= 1.2.6
 Requires(hint): php-pear(Net_Curl) >= 1.2.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(%{ClassName}) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
 
 %description
 Payment_Process is a gateway-independent framework for processing credit
@@ -30,24 +30,28 @@ cards, e-checks and eventually other forms of payments as well.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
-cd %{ClassName}-%{version}
+# 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
-cd %{ClassName}-%{version}
+cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd %{ClassName}-%{version}
+cd %{pear_name}-%{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
 
 # Fix end of line encodings
-sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{ClassName}/LICENSE-BSD
-sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{ClassName}/examples/*
+sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/LICENSE-BSD
+sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/examples/*
 
 # Move documentation
 mkdir -p docdir
@@ -58,7 +62,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}
 
 
 %clean
@@ -67,24 +71,29 @@ 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
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{ClassName} >/dev/null ||:
+        %{pear_name} >/dev/null ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
-%{pear_xmldir}/%{ClassName}.xml
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Payment
 %{pear_phpdir}/Payment/Process.php
 
 
 %changelog
+* Tue Aug 31 2010 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-4
+- clean define + rename macro
+- rename Payment_Process.xml to php-pear-Payment-Process.xml
+- set date.timezone during build
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild