[php-pear-Net-URL-Mapper] fix FTBFS, update tests suite from git

[Remi Collet]

commit c040ec98004d059057bb599d5557c91ba112fae2
Author: remi <fedora at famillecollet.com>
Date:   Mon Jan 16 10:44:57 2012 +0100

    fix FTBFS, update tests suite from git

 .gitignore                   |    2 +-
 Net_URL_Mapper-git.patch     |   24 ++++++++++++++++++++++++
 php-pear-Net-URL-Mapper.spec |   10 +++++++++-
 xml2changelog                |   21 ++++++++++++---------
 4 files changed, 46 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9046547..8c0848f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-Net_URL_Mapper-0.9.0.tgz
+*spec~
 package.xml
 /Net_URL_Mapper-0.9.1.tgz
diff --git a/Net_URL_Mapper-git.patch b/Net_URL_Mapper-git.patch
new file mode 100644
index 0000000..ccb9577
--- /dev/null
+++ b/Net_URL_Mapper-git.patch
@@ -0,0 +1,24 @@
+diff -up Net_URL_Mapper-0.9.1/php-pear-Net-URL-Mapper.xml.orig Net_URL_Mapper-0.9.1/php-pear-Net-URL-Mapper.xml
+--- Net_URL_Mapper-0.9.1/php-pear-Net-URL-Mapper.xml.orig	2012-01-16 10:42:04.000000000 +0100
++++ Net_URL_Mapper-0.9.1/php-pear-Net-URL-Mapper.xml	2012-01-16 10:42:13.000000000 +0100
+@@ -46,7 +46,7 @@ Bug #17271 small tweaks required to get
+    <file baseinstalldir="" md5sum="19e42bbc95ef24507c2ec0cc5257e644" name="scripts/create_package.xml.php" role="script" />
+    <file baseinstalldir="" md5sum="b94bcec0fbd8eeaade4ef9eb14b0edd3" name="scripts/generate_path.php" role="script" />
+    <file baseinstalldir="" md5sum="5b4833fb1479b004bdf144a02ebcf51f" name="scripts/update_package.xml.php" role="script" />
+-   <file baseinstalldir="Net/URL" md5sum="472867b6759f3adb0cfb6955e5ce7cb1" name="tests/ExceptionTest.php" role="test" />
++   <file baseinstalldir="Net/URL" name="tests/ExceptionTest.php" role="test" />
+    <file baseinstalldir="Net/URL" md5sum="972fa0c4b6cdc8e6778571bfe4076c58" name="tests/GenerationTest.php" role="test" />
+    <file baseinstalldir="Net/URL" md5sum="f21a62821f6e0f09172029061283e29f" name="tests/RecognitionTest.php" role="test" />
+    <file baseinstalldir="Net/URL" md5sum="e5ae309361a8862c542931f9894266dc" name="Mapper.php" role="php" />
+diff -up Net_URL_Mapper-0.9.1/tests/ExceptionTest.php.orig Net_URL_Mapper-0.9.1/tests/ExceptionTest.php
+--- Net_URL_Mapper-0.9.1/tests/ExceptionTest.php.orig	2012-01-16 10:40:20.000000000 +0100
++++ Net_URL_Mapper-0.9.1/tests/ExceptionTest.php	2012-01-16 10:41:49.000000000 +0100
+@@ -49,7 +49,7 @@ require_once 'Net/URL/Mapper.php';
+ /**
+  * PHPUnit Test Case
+  */
+-require_once 'PHPUnit/Framework.php';
++require_once 'PHPUnit/Framework/TestCase.php';
+ 
+ /**
+  * URL recognition tests for Net_URL_Mapper class
diff --git a/php-pear-Net-URL-Mapper.spec b/php-pear-Net-URL-Mapper.spec
index 05f2016..a9dfd6e 100644
--- a/php-pear-Net-URL-Mapper.spec
+++ b/php-pear-Net-URL-Mapper.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Net-URL-Mapper
 Version:        0.9.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple and flexible way to build nice URLs for web applications
 
 Group:          Development/Languages
@@ -12,6 +12,9 @@ URL:            http://pear.php.net/package/Net_URL_Mapper
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
+# https://github.com/pear/Net_URL_Mapper/commit/6d6ffc9e8ea3bc87e448c55ec529f52d56d8eca1
+Patch1:         Net_URL_Mapper-git.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
@@ -44,6 +47,8 @@ cd %{pear_name}-%{version}
 # Package.xml is V2
 mv ../package.xml %{name}.xml
 
+%patch1 -p1 -b .orig
+
 
 %build
 cd %{pear_name}-%{version}
@@ -100,6 +105,9 @@ phpunit \
 
 
 %changelog
+* Mon Jan 16 2012 Remi Collet <remi at fedoraproject.org> - 0.9.1-5
+- fix from GIT for test suite
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
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",