[php-pear-PHP-Compat] fix metadata location
Remi Collet
remi at fedoraproject.org
Tue Feb 19 15:42:01 UTC 2013
commit 6588986ab135ffc6889d75b516c7453f53b7f1ae
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Feb 19 16:41:55 2013 +0100
fix metadata location
php-pear-PHP-Compat.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/php-pear-PHP-Compat.spec b/php-pear-PHP-Compat.spec
index 1c9ce3d..3edfcd7 100644
--- a/php-pear-PHP-Compat.spec
+++ b/php-pear-PHP-Compat.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name PHP_Compat
Name: php-pear-PHP-Compat
Version: 1.5.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Provides missing functionality for older versions of PHP
Summary(fr): Fournit les fonctionnalités manquantes aux anciennes versions de PHP
@@ -13,15 +14,18 @@ URL: http://pear.php.net/package/PHP_Compat
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1: PHP-LICENSE-3.01
Source2: xml2changelog
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php-pear(PEAR)
+
Provides: php-pear(%{pear_name}) = %{version}
+
%description
PHP_Compat provides missing functionality for older versions of PHP.
This include fonctions and constants.
@@ -44,21 +48,17 @@ cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
%install
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
%{__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}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-%check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,6 +81,9 @@ fi
%{pear_testdir}/%{pear_name}
%changelog
+* Tue Feb 19 2013 Remi Collet <remi at fedoraproject.org> - 1.5.0-11
+- fix metadata location
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list