[php-pear-PEAR-Command-Packaging] take care of new metadata_dir option

[Remi Collet]

commit daccfc7e967c55c7b4bbd7bae75236e1f6771c9a
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Oct 24 09:16:34 2012 +0200

    take care of new metadata_dir option

 ...ear-PEAR-Command-Packaging-0.3.0-metadata.patch |   15 +++++++++++++++
 ...PEAR-Command-Packaging-fedora-template-specfile |    3 ++-
 php-pear-PEAR-Command-Packaging.spec               |   15 +++++++++++----
 3 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/php-pear-PEAR-Command-Packaging-0.3.0-metadata.patch b/php-pear-PEAR-Command-Packaging-0.3.0-metadata.patch
new file mode 100644
index 0000000..948df7d
--- /dev/null
+++ b/php-pear-PEAR-Command-Packaging-0.3.0-metadata.patch
@@ -0,0 +1,15 @@
+diff -up PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php.old PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php
+--- PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php.old	2012-10-24 09:06:12.000000000 +0200
++++ PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php	2012-10-24 09:07:23.000000000 +0200
+@@ -531,8 +531,9 @@ Wrote: /path/to/rpm-build-tree/RPMS/noar
+         
+         // Construct a fake registry inside the ultimate destination
+         // temporary directory, and load the necessary channel into it
+-        $regdir = $instroot . $this->config->get('php_dir');
+-        $fakereg = new PEAR_Registry($regdir);
++        $phpdir = $instroot . $this->config->get('php_dir');
++        $regdir = $instroot . $this->config->get('metadata_dir');
++        $fakereg = new PEAR_Registry($phpdir, false, false, $regdir);
+         $fakereg->addChannel($chan);
+ 
+         $tmp = $this->config->get('verbose');
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..886d0d7 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:        5%{?dist}
 Summary:        Create RPM spec files from PEAR modules
 
 Group:          Development/System
@@ -12,12 +13,13 @@ URL:            http://pear.php.net/package/PEAR_Command_Packaging
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source1:        php-pear-PEAR-Command-Packaging-fedora-template-specfile
 Patch0:         php-pear-PEAR-Command-Packaging-0.3.0-fedora-conventions.patch
+Patch1:         php-pear-PEAR-Command-Packaging-0.3.0-metadata.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 
-Requires:       php-pear(PEAR) >= 1.4.3
+Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -40,6 +42,8 @@ mv ../package.xml %{name}.xml
 
 # Patches for Fedora conventions
 %patch0 -p1 -b .fedora
+# Patches for new Metadata location
+%patch1 -p1 -b .metadata
 
 
 %build
@@ -53,7 +57,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 +88,9 @@ fi
 
 
 %changelog
+* Tue Oct 23 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-5
+- take care of new metadata_dir option
+
 * Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-4
 - rebuilt for new pear_datadir