[php-pear-XML-Serializer] clean spec

Remi Collet remi at fedoraproject.org
Mon Aug 23 17:30:03 UTC 2010


commit f6aaa04fa4cab0dbb7c1c39b84b12f050968e0cb
Author: remi <fedora at famillecollet.com>
Date:   Mon Aug 23 19:29:56 2010 +0200

    clean spec

 .gitignore                   |    3 +++
 php-pear-XML-Serializer.spec |   23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19ace8c..7b1cd70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 XML_Serializer-0.20.0.tgz
+package2.xml
+package.sig
+package.xml
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 39b5750..53a12b1 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name XML_Serializer
+%global pear_name XML_Serializer
 
 Name:           php-pear-XML-Serializer
 Version:        0.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Swiss-army knife for reading and writing XML files
 
 Group:          Development/Libraries
@@ -15,7 +15,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
+Requires:       php-pear(PEAR) 
+Requires:       php-pear(XML_Util) >= 1.1.1
+Requires:       php-pear(XML_Parser) >= 1.2.6
 Requires:       php-xml
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -29,9 +31,13 @@ without the need for DOM.
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{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 V1 - package2.xml is V2
+mv ../package2.xml %{name}.xml
 
 
 %build
@@ -42,7 +48,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -90,6 +96,11 @@ fi
 
 
 %changelog
+* Mon Aug 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.20.0-2
+- clean define
+- set date.timezone during build
+- use version in "Requires".
+
 * Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> 0.20.0-1
 - update to 0.20.0
 - License is BSD (since 0.19.0)


More information about the scm-commits mailing list