[php-pear-XML-Parser] doc in /usr/share/doc/pear

[Remi Collet]

commit e9c1a7be35431ef700a02f64fa9f731fd0f5e323
Author: remi <fedora at famillecollet.com>
Date:   Sat Apr 30 18:52:40 2011 +0200

    doc in /usr/share/doc/pear

 php-pear-XML-Parser.spec |   22 ++++++++++------------
 xml2changelog            |   21 ++++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/php-pear-XML-Parser.spec b/php-pear-XML-Parser.spec
index 06275fb..5862fa1 100644
--- a/php-pear-XML-Parser.spec
+++ b/php-pear-XML-Parser.spec
@@ -3,7 +3,7 @@
 
 Name:         php-pear-XML-Parser
 Version:      1.3.4
-Release:      2%{?dist}
+Release:      3%{?dist}
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 License:      BSD
@@ -71,8 +71,8 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
-pushd %{pear_name}-%{version}
+rm -rf %{buildroot}
+cd %{pear_name}-%{version}
 
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -83,19 +83,13 @@ rm -rf %{buildroot}%{pear_phpdir}/.??*
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-popd
-# Sort out documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name} docdir
-for file in  docdir/examples/*; do
+# Fic documentation
+for file in  %{buildroot}%{pear_docdir}/%{pear_name}/examples/*; do
   %{__sed} -i -e 's/\r//' $file
 done
 
 
 %check
-# Sanity check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
 cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} \
    run-tests \
@@ -120,7 +114,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/examples
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/XML/Parser
 %{pear_phpdir}/XML/Parser.php
 %{pear_testdir}/%{pear_name}
@@ -128,6 +123,9 @@ fi
 
 
 %changelog
+* Sat Apr 30 2011 Remi Collet <Fedora at FamilleCollet.com> 1.3.4-3
+- doc in /usr/share/doc/pear
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..4c789f4 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",