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

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


commit 7ef9526ec6d6ee25a86569c3b778063eb3a8a0c5
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Mon Apr 1 21:12:55 2013 +0200

    Fix metadata location, FTBFS #914341

 php-ezc-EventLogDatabaseTiein.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/php-ezc-EventLogDatabaseTiein.spec b/php-ezc-EventLogDatabaseTiein.spec
index d163a12..68a33ad 100644
--- a/php-ezc-EventLogDatabaseTiein.spec
+++ b/php-ezc-EventLogDatabaseTiein.spec
@@ -1,10 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name EventLogDatabaseTiein
-%define channel components.ez.no
+
+%global pear_name EventLogDatabaseTiein
+%global channel components.ez.no
 
 Name:           php-ezc-EventLogDatabaseTiein
 Version:        1.0.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Contains the database writer backend for the EventLog component
 
 Group:          Development/Libraries
@@ -38,7 +39,7 @@ to which the log is written should already exist.
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 # This are really doc, not data, not used in the code
@@ -53,19 +54,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
@@ -89,6 +90,9 @@ fi
 
 
 %changelog
+* Mon Apr 01 2013 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.0.2-7
+- Fix metadata location, FTBFS #914343
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list