[php-pear-XML-Serializer/el6/master] update to 0.20.2 - QA release

[Remi Collet]

commit 7805418bd95ab29adc26ab188e516f2c4b6bc778
Author: remi <fedora at famillecollet.com>
Date:   Tue Oct 26 19:21:40 2010 +0200

    update to 0.20.2 - QA release

 .gitignore                   |    1 +
 php-pear-XML-Serializer.spec |   42 ++++++++++++++++++++++++++++--------------
 sources                      |    2 +-
 xml2changelog                |   40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b1cd70..2438bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ XML_Serializer-0.20.0.tgz
 package2.xml
 package.sig
 package.xml
+/XML_Serializer-0.20.2.tgz
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 56ccc86..27dc284 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -2,19 +2,25 @@
 %global pear_name XML_Serializer
 
 Name:           php-pear-XML-Serializer
-Version:        0.20.0
-Release:        2%{?dist}
+Version:        0.20.2
+Release:        1%{?dist}
 Summary:        Swiss-army knife for reading and writing XML files
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/XML_Serializer
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+# for tests
+BuildRequires:  php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires:  php-pear(XML_Util) >= 1.1.1
+BuildRequires:  php-pear(XML_Parser) >= 1.2.6
+Requires:       php-xml
+
 Requires:       php-pear(PEAR) 
 Requires:       php-pear(XML_Util) >= 1.1.1
 Requires:       php-pear(XML_Parser) >= 1.2.6
@@ -31,13 +37,15 @@ without the need for DOM.
 
 %prep
 %setup -q -c
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
 # Create a "localized" php.ini to avoid build warning
 cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
 
 cd %{pear_name}-%{version}
-# package.xml is V1 - package2.xml is V2
-mv ../package2.xml %{name}.xml
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -46,14 +54,15 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
+cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc docdir/%{pear_name}
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc/* ../docdir
+
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -68,11 +77,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %check
-# For documentation purpose only
-# After installation (with PHPUnit 3.4.15)
-# cd /usr/share/pear/test/XML_Serializer/tests
-# phpunit AllTests
-# OK (73 tests, 75 assertions)
+cd %{pear_name}-%{version}/tests
+phpunit \
+   -d date.timezone=UTC \
+   -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+   AllTests
 
 
 %post
@@ -89,13 +98,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/XML/*
 %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Tue Oct 26 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.20.2-1
+- Version 0.20.2 (beta) - API 0.20.0 (beta) - QA release
+- add generated Changelog
+- run phpunit test suite in %%check
+
 * Mon Aug 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.20.0-2
 - clean define
 - set date.timezone during build
diff --git a/sources b/sources
index e88094e..31f0e4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba7ff28ac7a5b44a0bd9ced2a2c2c722  XML_Serializer-0.20.0.tgz
+e603e4b967510ed913f6c6b2dc59a2a1  XML_Serializer-0.20.2.tgz
diff --git a/xml2changelog b/xml2changelog
new file mode 100644
index 0000000..eb6bd31
--- /dev/null
+++ b/xml2changelog
@@ -0,0 +1,40 @@
+<?php
+$prog=array_shift($_SERVER['argv']);
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
+$file=array_shift($_SERVER['argv']);
+
+($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
+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;
+
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
+		$tab = array();
+		foreach($xml->changelog->release as $rel) {
+			$old=$rel->version->release;
+			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->date, $rel->notes);
+	    	}
+	}
+} else { // Package.xml V 1.0
+	printf("* Version %s (%s) - %s\n\n%s\n\n",
+		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
+?>