[php-pear-Numbers-Words/el6/master] - update to 0.16.2 - rename Numbers_Words.xml to php-pear-Numbers-Words.xml - add %%check - set date

Remi Collet remi at fedoraproject.org
Sun Aug 15 12:34:33 UTC 2010


commit e788f1c28ee9418da270f8a6b7a59b0f9b773f9e
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 15 14:11:31 2010 +0200

    - update to 0.16.2
    - rename Numbers_Words.xml to php-pear-Numbers-Words.xml
    - add %%check
    - set date.timezone during build

 .gitignore                  |    1 +
 php-pear-Numbers-Words.spec |   42 +++++++++++++++++++++++++++++++-----------
 sources                     |    2 +-
 3 files changed, 33 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a277f5a..a9757f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Numbers_Words-0.16.1.tgz
+Numbers_Words-0.16.2.tgz
diff --git a/php-pear-Numbers-Words.spec b/php-pear-Numbers-Words.spec
index 225f7ec..6b19acf 100644
--- a/php-pear-Numbers-Words.spec
+++ b/php-pear-Numbers-Words.spec
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Numbers_Words
+%global pear_name Numbers_Words
 
 Name:           php-pear-Numbers-Words
-Version:        0.16.1
+Version:        0.16.2
 Release:        1%{?dist}
 Summary:        Methods for spelling numerals in words
 
@@ -10,12 +10,17 @@ Group:          Development/Languages
 License:        PHP
 URL:            http://pear.php.net/package/Numbers_Words
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+# For test suite
+BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
+
 Requires:       php-pear(PEAR)
+# optional and not yet available 
+# Requires:       php-pear(Math_BigInteger)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -29,10 +34,14 @@ Numbers_Words::toWords() with just a string.
 
 %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
+
+# 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
@@ -43,7 +52,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
@@ -56,7 +65,12 @@ 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}
+
+
+%check
+cd %{pear_name}-%{version}
+phpunit tests
 
 
 %clean
@@ -65,7 +79,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
@@ -76,13 +90,19 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Numbers
 
 
 %changelog
+* Sun Aug 15 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.16.2-1
+- update to 0.16.2
+- rename Numbers_Words.xml to php-pear-Numbers-Words.xml
+- add %%check
+- set date.timezone during build
+
 * Wed Sep 09 2009 Christopher Stone <chris.stone at gmail.com> 0.16.1-1
 - Upstream sync
 
diff --git a/sources b/sources
index 0c8b854..1acdb02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae1ccb8bed8f8716216be7eba891df7d  Numbers_Words-0.16.1.tgz
+a12f892aabc7a4c8eb9e4e5e9669ff04  Numbers_Words-0.16.2.tgz


More information about the scm-commits mailing list