[php-pear-Net-URL-Mapper/f14/master] fix merge...

Remi Collet remi at fedoraproject.org
Wed Oct 27 18:20:52 UTC 2010


commit 9d61a46e62e88caff0b1809823f72d635ba20edb
Author: remi <fedora at famillecollet.com>
Date:   Wed Oct 27 20:20:50 2010 +0200

    fix merge...

 php-pear-Net-URL-Mapper.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/php-pear-Net-URL-Mapper.spec b/php-pear-Net-URL-Mapper.spec
index 7e0c75a..f691214 100644
--- a/php-pear-Net-URL-Mapper.spec
+++ b/php-pear-Net-URL-Mapper.spec
@@ -1,5 +1,5 @@
 %{!?__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.1
@@ -40,9 +40,14 @@ frameworks and therefore can be used with your own router.
 %setup -qc
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
-[ -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}
@@ -52,14 +57,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}
 
@@ -69,7 +74,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


More information about the scm-commits mailing list