[php-pear-PEAR-Command-Packaging/f18] generate spec aware of pear %%{pear_metadir}

[Remi Collet]

commit 65b058e389e3f79c2a22928781d0f42267e66d85
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Oct 24 09:26:09 2012 +0200

    generate spec aware of pear %%{pear_metadir}

 ...PEAR-Command-Packaging-fedora-template-specfile |    3 ++-
 php-pear-PEAR-Command-Packaging.spec               |    8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/php-pear-PEAR-Command-Packaging-fedora-template-specfile b/php-pear-PEAR-Command-Packaging-fedora-template-specfile
index aa26df3..fe8efe4 100644
--- a/php-pear-PEAR-Command-Packaging-fedora-template-specfile
+++ b/php-pear-PEAR-Command-Packaging-fedora-template-specfile
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name @package@
 
@@ -42,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__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}
diff --git a/php-pear-PEAR-Command-Packaging.spec b/php-pear-PEAR-Command-Packaging.spec
index 3f32b43..afad304 100644
--- a/php-pear-PEAR-Command-Packaging.spec
+++ b/php-pear-PEAR-Command-Packaging.spec
@@ -1,9 +1,10 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name PEAR_Command_Packaging
 
 Name:           php-pear-PEAR-Command-Packaging
 Version:        0.3.0
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Create RPM spec files from PEAR modules
 
 Group:          Development/System
@@ -53,7 +54,7 @@ rm -rf %{buildroot}
 cp -p %{SOURCE1} %{buildroot}%{pear_datadir}/%{pear_name}/template.spec
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
@@ -84,6 +85,9 @@ fi
 
 
 %changelog
+* Wed Oct 24 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-4.1
+- generate spec aware of pear %%{pear_metadir}
+
 * Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-4
 - rebuilt for new pear_datadir