[php-pear-PEAR-Command-Packaging] rebuilt for new pear_datadir

Remi Collet remi at fedoraproject.org
Sun Aug 19 05:58:32 UTC 2012


commit 60f0545ab7edee2f2e8fc36e13908286e1969099
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 19 07:58:16 2012 +0200

    rebuilt for new pear_datadir

 ...PEAR-Command-Packaging-fedora-template-specfile |    6 ++++--
 php-pear-PEAR-Command-Packaging.spec               |    7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/php-pear-PEAR-Command-Packaging-fedora-template-specfile b/php-pear-PEAR-Command-Packaging-fedora-template-specfile
index 548a7ff..aa26df3 100644
--- a/php-pear-PEAR-Command-Packaging-fedora-template-specfile
+++ b/php-pear-PEAR-Command-Packaging-fedora-template-specfile
@@ -10,12 +10,14 @@ Group:          Development/Libraries
 License:        @release_license@
 URL:            http://@master_server@/package/@package@
 Source0:        http://@master_server@/get/%{pear_name}-%{version}.tgz
-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
+BuildRequires:  php-pear(PEAR)
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(PEAR)
 @extra_headers@
 
 %description
diff --git a/php-pear-PEAR-Command-Packaging.spec b/php-pear-PEAR-Command-Packaging.spec
index 154b443..3f32b43 100644
--- a/php-pear-PEAR-Command-Packaging.spec
+++ b/php-pear-PEAR-Command-Packaging.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-PEAR-Command-Packaging
 Version:        0.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Create RPM spec files from PEAR modules
 
 Group:          Development/System
@@ -50,7 +50,7 @@ cd %{pear_name}-%{version}
 rm -rf %{buildroot}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
-cp -p %{SOURCE1} %{buildroot}%{pear_phpdir}/data/%{pear_name}/template.spec
+cp -p %{SOURCE1} %{buildroot}%{pear_datadir}/%{pear_name}/template.spec
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -84,6 +84,9 @@ fi
 
 
 %changelog
+* Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-4
+- rebuilt for new pear_datadir
+
 * Tue Aug 14 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-3
 - rebuilt for new pear_testdir
 


More information about the scm-commits mailing list