[php-pear-XML-Serializer] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 16:50:55 UTC 2013


commit 8c8ca442d2266915c546d5b31e0bfce9a1be1ace
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 17:50:49 2013 +0100

    fix metadata location

 php-pear-XML-Serializer.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 851194a..c679ffd 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name XML_Serializer
 
 Name:           php-pear-XML-Serializer
 Version:        0.20.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Swiss-army knife for reading and writing XML files
 
 Group:          Development/Libraries
@@ -17,7 +18,7 @@ Patch1:         XML_Serializer-svn.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 # for tests
 BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
 BuildRequires:  php-pear(XML_Util) >= 1.1.1
@@ -63,7 +64,7 @@ cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
@@ -104,6 +105,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 0.20.2-10
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list