[php-pear-File-Find] update to 1.3.2 (QA Release)

[Remi Collet]

commit 2b7f54cf2dcbd76c299dc2b560a5404998a0a3cf
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Oct 23 07:06:06 2012 +0200

    update to 1.3.2 (QA Release)

 .gitignore              |    1 +
 File_Find.patch         |   24 ------------------------
 php-pear-File-Find.spec |   28 ++++++++++++++++------------
 sources                 |    2 +-
 xml2changelog           |   21 ++++++++++++---------
 5 files changed, 30 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e171a2f..9335836 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 package-*.xml
 File_Find-1.3.0.tgz
 /File_Find-1.3.1.tgz
+/File_Find-1.3.2.tgz
diff --git a/php-pear-File-Find.spec b/php-pear-File-Find.spec
index bc42924..0845d1b 100644
--- a/php-pear-File-Find.spec
+++ b/php-pear-File-Find.spec
@@ -1,27 +1,30 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name File_Find
 
 Summary:        Class which facilitates the search of filesystems
 Summary(fr):    Classe facilitant la recherche dans le système de fichiers
 Name:           php-pear-File-Find
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
-
 URL:            http://pear.php.net/package/File_Find
-Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source2:        xml2changelog
 
-# See https://pear.php.net/bugs/19530 - Array to string conversion
-Patch0:         %{pear_name}.patch
+# Corrupted archive
+# tar xif File_Find-1.3.2.tgz
+# tar czf File_Find-1.3.2.tgz package.xml File_Find-1.3.2
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires:  php-pear
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+Requires:       php-pear(PEAR)
+Requires:       php-pcre
 Provides:       php-pear(%{pear_name}) = %{version}
 
 
@@ -45,8 +48,6 @@ sympathiques.
 cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
-sed -i -e '/Find.php/s/md5sum=".*" name/name/' %{name}.xml
-%patch0 -p0
 
 
 %build
@@ -60,7 +61,7 @@ pushd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
@@ -103,6 +104,9 @@ fi
 
 
 %changelog
+* Tue Oct 23 2012 Remi Collet <remi at fedoraproject.org> - 1.3.2-1
+- Version 1.3.2 (stable) - API 1.3.0 (stable)
+
 * Tue Aug 14 2012 Remi Collet <remi at fedoraproject.org> - 1.3.1-5
 - rebuilt for new pear_testdir
 
diff --git a/sources b/sources
index 204a96c..02b93ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02df98fab80257d2840c0567382685a3  File_Find-1.3.1.tgz
+bef41a0cdf9e65eff59b4c3ac51a0e82  File_Find-1.3.2.tgz
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..3a31be6 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,11 +7,14 @@ $file=array_shift($_SERVER['argv']);
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-		$xml->version->release, $xml->stability->release, 
-		$xml->version->api, $xml->stability->api, 
-		$xml->date, $xml->notes);
-	$new=$xml->version->release;
+	$new = "";
+	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
+		printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+			$xml->version->release, $xml->stability->release,
+			$xml->version->api, $xml->stability->api,
+			$xml->date, $xml->notes);
+		$new=$xml->version->release;
+	}
 
 	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
 		$tab = array();
@@ -20,14 +23,14 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
 			if ("$old" != "$new") {
 				$tab[''.$rel->date] = $rel;
 			}
-		}	
+		}
 		krsort($tab);
 		foreach($tab as $rel) {
 			printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-				$rel->version->release, $rel->stability->release, 
-				$rel->version->api, $rel->stability->api, 
+				$rel->version->release, $rel->stability->release,
+				$rel->version->api, $rel->stability->api,
 				$rel->date, $rel->notes);
-	    	}
+		}
 	}
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",