[php-ezc-Feed] Fix metadata location, FTBFS #914341

Guillaume Kulakowski llaumgui at fedoraproject.org
Mon Apr 1 19:18:59 UTC 2013


commit 95eccb66624273f2fc832c13217f27ffbc7c4115
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Mon Apr 1 21:18:55 2013 +0200

    Fix metadata location, FTBFS #914341

 php-ezc-Feed.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/php-ezc-Feed.spec b/php-ezc-Feed.spec
index 9fece19..2909113 100644
--- a/php-ezc-Feed.spec
+++ b/php-ezc-Feed.spec
@@ -1,10 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Feed
-%define channel components.ez.no
+
+%global pear_name Feed
+%global channel components.ez.no
 
 Name:           php-ezc-Feed
 Version:        1.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        This component handles parsing and creating RSS1, RSS2 and ATOM feeds
 
 Group:          Development/Libraries
@@ -31,8 +32,8 @@ support for different feed modules (dc, content, creativeCommons, geo, iTunes).
 
 %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
@@ -47,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
@@ -83,6 +84,9 @@ fi
 
 
 %changelog
+* Mon Apr 01 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.7
+- Fix metadata location, FTBFS #914344
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list