[php-pear-Numbers-Roman] clean spec

Remi Collet remi at fedoraproject.org
Sat Aug 28 07:03:37 UTC 2010


commit 55625dde35999e750107b71f4a33f69e6b05fea6
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 28 09:03:27 2010 +0200

    clean spec

 .gitignore                  |    1 +
 php-pear-Numbers-Roman.spec |   43 +++++++++++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23e78c4..dc01bea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Numbers_Roman-1.0.2.tgz
+package.xml
diff --git a/php-pear-Numbers-Roman.spec b/php-pear-Numbers-Roman.spec
index a2ae386..56d4e96 100644
--- a/php-pear-Numbers-Roman.spec
+++ b/php-pear-Numbers-Roman.spec
@@ -1,20 +1,22 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Numbers_Roman
+%global pear_name Numbers_Roman
 
 Name:           php-pear-Numbers-Roman
 Version:        1.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Provides methods for converting to and from Roman Numerals
 
 Group:          Development/Languages
 License:        PHP
 URL:            http://pear.php.net/package/Numbers_Roman
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+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)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -28,10 +30,13 @@ styles and conversion for and to numbers up to 5 999 999.
 
 %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.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -42,7 +47,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 +58,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
@@ -62,7 +67,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
@@ -70,16 +75,30 @@ if [ $1 -eq 0 ] ; then
         %{pear_name} >/dev/null || :
 fi
 
+%check
+cd %{pear_name}-%{version}
+phpunit \
+   -d date.timezone=UTC \
+   -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+   tests
+
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Numbers
 %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-5
+- clean define
+- rename Numbers_Roman.xml to php-pear-Numbers-Roman.xml
+- remove LICENSE (not provided by upstream)
+- set date.timezone during build
+- run phpunit during %%check
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list