[php-ezc-ConsoleTools] Fix metadata location, FTBFS #914339

Guillaume Kulakowski llaumgui at fedoraproject.org
Mon Apr 1 18:32:49 UTC 2013


commit b18e3a49d9e5dec1fa56ff1365e4c4b922387904
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Mon Apr 1 20:32:39 2013 +0200

    Fix metadata location, FTBFS #914339

 php-ezc-ConsoleTools.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/php-ezc-ConsoleTools.spec b/php-ezc-ConsoleTools.spec
index c028ca0..c120d28 100644
--- a/php-ezc-ConsoleTools.spec
+++ b/php-ezc-ConsoleTools.spec
@@ -5,7 +5,7 @@
 
 Name:           php-ezc-ConsoleTools
 Version:        1.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A set of classes to do different actions with the console
 
 Group:          Development/Libraries
@@ -32,8 +32,8 @@ that run on a computer console (sometimes also called shell or command line).
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || %{__mv} package.xml package2.xml
-%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || mv package.xml package2.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 # This are really doc, not data, not used in the code
@@ -48,19 +48,19 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 %{__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}
-%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 
 %post
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Apr 01 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-7
+- Fix metadata location, FTBFS #914339
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list