[php-pear-HTTP] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 08:50:54 UTC 2013
commit c969f5aff63272d0b77c8123f925b4a6379a3ae7
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 09:50:47 2013 +0100
fix metadata location
php-pear-HTTP.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-HTTP.spec b/php-pear-HTTP.spec
index ab6e946..5cab749 100644
--- a/php-pear-HTTP.spec
+++ b/php-pear-HTTP.spec
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name HTTP
@@ -5,7 +6,7 @@ Summary: Miscellaneous HTTP utilities
Summary(fr): Divers utilitaires HTTP
Name: php-pear-HTTP
Version: 1.4.1
-Release: 11%{?dist}
+Release: 12%{?dist}
License: PHP
Group: Development/Libraries
URL: http://pear.php.net/package/HTTP
@@ -36,10 +37,6 @@ redirections HTTP.
%setup -c -q
%{_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
@@ -53,10 +50,10 @@ mv ../package.xml %{name}.xml
rm -rf %{buildroot}
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
# Install XML package description
%{__mkdir_p} %{buildroot}%{pear_xmldir}
@@ -96,6 +93,9 @@ fi
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.4.1-12
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list