[php-pear-Net-URL-Mapper] clean spec

[Remi Collet]

commit 15c79078dcef341e572dc9560465d735ceb63699
Author: remi <fedora at famillecollet.com>
Date:   Wed Aug 18 20:38:53 2010 +0200

    clean spec

 .gitignore                   |    1 +
 php-pear-Net-URL-Mapper.spec |   32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd00fe8..fe6ac75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Net_URL_Mapper-0.9.0.tgz
+package.xml
diff --git a/php-pear-Net-URL-Mapper.spec b/php-pear-Net-URL-Mapper.spec
index 9f97b96..3817ea9 100644
--- a/php-pear-Net-URL-Mapper.spec
+++ b/php-pear-Net-URL-Mapper.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_URL_Mapper
+%global pear_name Net_URL_Mapper
 
 Name:           php-pear-Net-URL-Mapper
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple and flexible way to build nice URLs for web applications
 
 Group:          Development/Languages
@@ -37,9 +37,14 @@ frameworks and therefore can be used with your own router.
 %setup -qc
 %patch0 -p1
 
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_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 V2
+mv ../package.xml %{name}.xml
+
 
 %build
 cd %{pear_name}-%{version}
@@ -49,14 +54,14 @@ 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
 
 # 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 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 cd $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}
 
@@ -66,7 +71,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,20 +81,25 @@ fi
 
 
 %check
-# check does not work under mock
-#cd $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}/tests
-#sh run
+# check does not work under mock (and requires old PHPUnit)
+# cd /usr/share/pear/test/Net_URL_Mapper/tests
+# sh run
 
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %dir %{pear_phpdir}/Net/URL
 %{pear_phpdir}/Net/URL/Mapper*
 
 
 %changelog
+* Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.9.0-5
+- rename Net_URL_Mapper.xml to php-pear-Net-URL-Mapper.xml
+- set date.timezone during build
+- clean define
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild