[php-phpunit-phpcpd/f18] Fix FTBFS #914374
Guillaume Kulakowski
llaumgui at fedoraproject.org
Wed Apr 10 10:37:35 UTC 2013
commit ffa34e1075cdd03025ff310e8ad528acf9d0a2e2
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date: Wed Apr 10 07:59:09 2013 +0200
Fix FTBFS #914374
php-phpunit-phpcpd.spec | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/php-phpunit-phpcpd.spec b/php-phpunit-phpcpd.spec
index afe991a..07850e8 100644
--- a/php-phpunit-phpcpd.spec
+++ b/php-phpunit-phpcpd.spec
@@ -4,18 +4,19 @@
Name: php-phpunit-phpcpd
Version: 1.3.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Copy/Paste Detector (CPD) for PHP code
Group: Development/Libraries
License: BSD
URL: http://github.com/sebastianbergmann/phpcpd
Source0: http://pear.phpunit.de/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.9.4
BuildRequires: php-channel(%{channel})
+
Requires: php-common >= 5.2.7
Requires: php-tokenizer
Requires: php-xml
@@ -24,7 +25,7 @@ Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php-pear(pear.phpunit.de/File_Iterator) >= 1.3.0
Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.2
-Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6
+Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6
Provides: php-pear(%{channel}/%{pear_name}) = %{version}
@@ -52,10 +53,10 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf %{buildroot} docdir
-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}
@@ -67,13 +68,13 @@ rm -rf %{buildroot}
%post
-pear install --nodeps --soft --force --register-only \
+%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- pear uninstall --nodeps --ignore-errors --register-only \
+ %{__pear} uninstall --nodeps --ignore-errors --register-only \
%{channel}/%{pear_name} >/dev/null || :
fi
@@ -86,6 +87,9 @@ fi
%changelog
+* Wed Apr 10 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.5-4
+- Fix metadata location, FTBFS #914374
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list