[php-pear-Net-Traceroute] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 09:00:49 UTC 2013
commit 0a7d95ec7d7b8fd57b6978c81897ea9ea71bb78e
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 10:00:42 2013 +0100
fix metadata location
php-pear-Net-Traceroute.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-Net-Traceroute.spec b/php-pear-Net-Traceroute.spec
index 2c2e4b1..41e12f2 100644
--- a/php-pear-Net-Traceroute.spec
+++ b/php-pear-Net-Traceroute.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Net_Traceroute
Name: php-pear-Net-Traceroute
Version: 0.21.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Execute traceroute
Group: Development/Libraries
@@ -29,10 +30,6 @@ OS independent wrapper class for executing traceroute calls.
%setup -q -c
%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
-# 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
@@ -44,12 +41,12 @@ cd %{pear_name}-%{version}
%install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
-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
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
@@ -81,6 +78,9 @@ fi
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 0.21.3-7
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.21.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list