[php-pear-HTTP-OAuth] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 11:21:39 UTC 2013


commit e0581eef26545348f6d62256614d22d0ff9a8ab2
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 12:21:31 2013 +0100

    fix metadata location

 php-pear-HTTP-OAuth.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/php-pear-HTTP-OAuth.spec b/php-pear-HTTP-OAuth.spec
index 45a8637..774871f 100644
--- a/php-pear-HTTP-OAuth.spec
+++ b/php-pear-HTTP-OAuth.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name HTTP_OAuth
 
 Name:           php-pear-HTTP-OAuth
 Version:        0.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Implementation of the OAuth spec
 
 Group:          Development/Libraries
@@ -15,7 +16,7 @@ Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 # For test suite
 BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
 BuildRequires:  php-pear(HTTP_Request2) >= 0.5.1
@@ -62,7 +63,7 @@ cd %{pear_name}-%{version}
 sed -i -e 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/examples/jquery.fade.js
 
 # 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.2.3-6
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list