[php-pear-Payment-Process] remove Requires(hint), fix FTBFS #716070 + doc in /usr/share/doc/pear
Remi Collet
remi at fedoraproject.org
Wed Jul 6 18:08:04 UTC 2011
commit 051bfbe73c7d59b402639664990c7c71b199115b
Author: remi <fedora at famillecollet.com>
Date: Wed Jul 6 20:07:50 2011 +0200
remove Requires(hint), fix FTBFS #716070 + doc in /usr/share/doc/pear
php-pear-Payment-Process.spec | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/php-pear-Payment-Process.spec b/php-pear-Payment-Process.spec
index 92f848a..5e34e39 100644
--- a/php-pear-Payment-Process.spec
+++ b/php-pear-Payment-Process.spec
@@ -3,7 +3,7 @@
Name: php-pear-Payment-Process
Version: 0.6.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Unified payment processor
Group: Development/Libraries
@@ -17,8 +17,8 @@ BuildRequires: php-pear >= 1:1.4.9-1.2
Requires: php php-pear(PEAR)
Requires: php-pear(Validate) >= 0.5.0
Requires: php-pear(Validate_Finance_CreditCard) >= 0.5.0
-Requires(hint): php-pear(XML_Parser) >= 1.2.6
-Requires(hint): php-pear(Net_Curl) >= 1.2.0
+Requires: php-pear(XML_Parser) >= 1.2.6
+Requires: php-pear(Net_Curl) >= 1.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides: php-pear(%{pear_name}) = %{version}
@@ -30,10 +30,6 @@ cards, e-checks and eventually other forms of payments as well.
%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.xml is V2
mv ../package.xml %{name}.xml
@@ -46,17 +42,13 @@ 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
+rm -rf $RPM_BUILD_ROOT
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Fix end of line encodings
sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/LICENSE-BSD
sed -i 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/examples/*
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,13 +74,17 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Payment
%{pear_phpdir}/Payment/Process.php
%changelog
+* Wed Jul 6 2011 Remi Collet <Fedora at FamilleCollet.com> 1.5.6-3
+- remove Requires(hint), fix FTBFS #716070
+- doc in /usr/share/doc/pear
+
* 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