[php-pear-Net-URL] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 15:10:09 UTC 2013


commit 4f12896cbef0701b2721d4e6fbdcfcc7d7fa42f5
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 16:09:59 2013 +0100

    fix metadata location

 php-pear-Net-URL.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-Net-URL.spec b/php-pear-Net-URL.spec
index fa575ad..fec9f95 100644
--- a/php-pear-Net-URL.spec
+++ b/php-pear-Net-URL.spec
@@ -1,19 +1,21 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Net_URL
 
 Name:           php-pear-Net-URL
 Version:        1.0.15
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Easy parsing of URLs
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/Net_URL
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-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
+BuildRequires:  php-pear
+
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -25,9 +27,6 @@ Provides easy parsing of URLs and their constituent parts.
 
 %prep
 %setup -qc
-# 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
@@ -42,10 +41,10 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
@@ -75,6 +74,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.0.15-10
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.15-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list