[php-pear-Validate-Finance-CreditCard/el6/master] clean spec

Remi Collet remi at fedoraproject.org
Sat Aug 28 06:32:08 UTC 2010


commit 7ba75064083d3baab82ad1a33bd474dcaa34bf5f
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 28 08:26:55 2010 +0200

    clean spec

 .gitignore                                |    1 +
 php-pear-Validate-Finance-CreditCard.spec |   44 +++++++++++++++++-----------
 2 files changed, 28 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aad5ad8..f260d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Validate_Finance_CreditCard-0.5.3.tgz
+package.xml
diff --git a/php-pear-Validate-Finance-CreditCard.spec b/php-pear-Validate-Finance-CreditCard.spec
index c478b65..0a9e9a6 100644
--- a/php-pear-Validate-Finance-CreditCard.spec
+++ b/php-pear-Validate-Finance-CreditCard.spec
@@ -1,15 +1,15 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define ClassName Validate_Finance_CreditCard
+%global pear_name Validate_Finance_CreditCard
 
 Name:           php-pear-Validate-Finance-CreditCard
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Validation class for Credit Cards
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Validate_Finance_CreditCard
-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
@@ -17,7 +17,7 @@ BuildRequires:  php-pear >= 1:1.7.2
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(%{ClassName}) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
 
 %description
 Package to validate Credit Card numbers and types.
@@ -25,34 +25,38 @@ Package to validate Credit Card numbers and types.
 
 %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
 
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
 
 # Fix EOL encoding
-sed -i 's/\r//' docdir/%{ClassName}/LICENSE
+sed -i 's/\r//' docdir/%{pear_name}/LICENSE
 
 # 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 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -61,25 +65,31 @@ 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
-%{pear_testdir}/%{ClassName}
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%{pear_xmldir}/%{name}.xml
+%{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Validate
 %{pear_phpdir}/Validate/Finance/CreditCard.php
 
 
 %changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.5.3-4
+- clean define
+- rename Validate_Finance_CreditCard.xml to php-pear-Validate-Finance-CreditCard.xml
+- set date.timezone during build
+
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list