[php-ezc-Template] Fix metadata location, FTBFS #914349

Guillaume Kulakowski llaumgui at fedoraproject.org
Mon Apr 1 20:10:04 UTC 2013


commit 1a43d47d0975c38de7c96b541828aa68f16dd83b
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Mon Apr 1 22:10:00 2013 +0200

    Fix metadata location, FTBFS #914349

 php-ezc-Template.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/php-ezc-Template.spec b/php-ezc-Template.spec
index 32670e5..4cf751f 100644
--- a/php-ezc-Template.spec
+++ b/php-ezc-Template.spec
@@ -1,10 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Template
-%define channel components.ez.no
+
+%global pear_name Template
+%global channel components.ez.no
 
 Name:           php-ezc-Template
 Version:        1.4.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A fully functional Templating system
 
 Group:          Development/Libraries
@@ -39,8 +40,8 @@ more expressive constructs for repetitive tasks in the presentation data.
 
 %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
@@ -55,19 +56,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
@@ -91,6 +92,9 @@ fi
 
 
 %changelog
+* Mon Apr 01 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - .1.4.2-7
+- Fix metadata location, FTBFS # 914349
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list