[php-pear-XML-Beautifier] update to 1.2.2 - QA release

[Remi Collet]

commit c0f035c825104b5657bdc269b37986e811223d26
Author: remi <fedora at famillecollet.com>
Date:   Mon Oct 25 19:04:12 2010 +0200

    update to 1.2.2 - QA release

 .gitignore                   |    1 +
 php-pear-XML-Beautifier.spec |   32 +++++++++++++++++++++++---------
 sources                      |    2 +-
 xml2changelog                |   40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd04771..cacf9ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 XML_Beautifier-1.2.0.tgz
 package.xml
 package2.xml
+/XML_Beautifier-1.2.2.tgz
diff --git a/php-pear-XML-Beautifier.spec b/php-pear-XML-Beautifier.spec
index 33b66e5..5c37da0 100644
--- a/php-pear-XML-Beautifier.spec
+++ b/php-pear-XML-Beautifier.spec
@@ -1,20 +1,27 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name XML_Beautifier
 
+# Test cannot be run with PHP 5 because the XML tag 
+# is not being included in the output.
+
 Name:           php-pear-XML-Beautifier
-Version:        1.2.0
-Release:        4%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Class to format XML documents
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/XML_Beautifier
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        xml2changelog
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
+
+Requires:       php-pear(PEAR) 
+Requires:       php-pear(XML_Util) >= 0.5
+Requires:       php-pear(XML_Parser) >= 1.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -39,13 +46,15 @@ will follow soon.
 
 %prep
 %setup -qc
+%{_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
@@ -54,13 +63,13 @@ 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_docdir}/%{pear_name} ../docdir
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -87,12 +96,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/XML/Beautifier*
+%{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Mon Oct 25 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- Version 1.2.2 (stable) - API 1.2.0 (stable)
+- add generated Changelog
+
 * Mon Aug 23 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.2.0-4
 - clean define
 - rename XML_Beautifier.xml to php-pear-XML-Beautifier.xml
diff --git a/sources b/sources
index 0b4d56c..6d968f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32e5fbe5a4fb499c3a472c0d1a3aad61  XML_Beautifier-1.2.0.tgz
+a5f57c749a09a1b598f0284c95f86e68  XML_Beautifier-1.2.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);
+}
+?>