[php-pear-Net-IPv4] fix metadata location

Remi Collet remi at fedoraproject.org
Tue Feb 19 15:36:13 UTC 2013


commit c30fc409dd15efc38940f4e0ef2e0702c34a0535
Author: Remi Collet <rcollet at redhat.com>
Date:   Tue Feb 19 16:36:06 2013 +0100

    fix metadata location

 php-pear-Net-IPv4.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/php-pear-Net-IPv4.spec b/php-pear-Net-IPv4.spec
index 31c8d69..5f340c4 100644
--- a/php-pear-Net-IPv4.spec
+++ b/php-pear-Net-IPv4.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name Net_IPv4
 
 Name:           php-pear-Net-IPv4
 Version:        1.3.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IPv4 network calculations and validation
 
 Group:          Development/Libraries
@@ -12,17 +13,18 @@ URL:            http://pear.php.net/package/Net_IPv4
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 BuildArch:      noarch
 # For tests
 BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
 
-
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+
 Provides:       php-pear(%{pear_name}) = %{version}
 
+
 %description
 Class used for calculating IPv4 (AF_INET family) address information
 such as network as network address, broadcast address, and IP address
@@ -47,7 +49,7 @@ cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 install -d %{buildroot}%{pear_xmldir}
@@ -85,6 +87,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.3.4-5
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list