[php-pear-Cache] remove Requires(hint), fix FTBFS #715731
Remi Collet
remi at fedoraproject.org
Wed Jul 6 17:03:33 UTC 2011
commit 7c26fd6796fd256d50e54b9dfe0137117f4bb68d
Author: remi <fedora at famillecollet.com>
Date: Wed Jul 6 19:03:18 2011 +0200
remove Requires(hint), fix FTBFS #715731
php-pear-Cache.spec | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Cache.spec b/php-pear-Cache.spec
index 3ebceda..6581143 100644
--- a/php-pear-Cache.spec
+++ b/php-pear-Cache.spec
@@ -7,7 +7,7 @@ Name: php-pear-Cache
Version: 1.5.6
%if %{?beta:0}%{!?beta:1}
-Release: 2%{?dist}
+Release: 3%{?dist}
%else
Release: 0.2.%{beta}%{?dist}
%endif
@@ -27,7 +27,8 @@ Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
Requires: php-pear(PEAR) >= 1.7.0
-Requires(hint): php-pear(HTTP_Request)
+Requires: php-pear(HTTP_Request)
+
%description
With the PEAR Cache you can cache the result of certain function
@@ -39,10 +40,6 @@ between applications.
%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}%{?beta}
# package.xml is V2
mv ../package.xml %{name}.xml
@@ -56,7 +53,7 @@ cd %{pear_name}-%{version}%{?beta}
%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}%{?beta}
-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
@@ -92,6 +89,9 @@ fi
%changelog
+* Wed Jul 6 2011 Remi Collet <Fedora at FamilleCollet.com> 1.5.6-3
+- remove Requires(hint), fix FTBFS #715731
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list