[php-pear-HTTP-OAuth] doc in /usr/share/doc/pear

[Remi Collet]

commit f9f3a832f4eee7e6ebca7452db15e78b91c6d309
Author: remi <fedora at famillecollet.com>
Date:   Sat Apr 16 17:39:04 2011 +0200

    doc in /usr/share/doc/pear

 php-pear-HTTP-OAuth.spec |   14 +++++++-------
 xml2changelog            |   21 ++++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/php-pear-HTTP-OAuth.spec b/php-pear-HTTP-OAuth.spec
index 9ec491c..54ed9dd 100644
--- a/php-pear-HTTP-OAuth.spec
+++ b/php-pear-HTTP-OAuth.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-HTTP-OAuth
 Version:        0.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the OAuth spec
 
 Group:          Development/Libraries
@@ -58,15 +58,12 @@ cd %{pear_name}-%{version}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
 # fix rpmlint warnings
-sed -i -e 's/\r//' docdir/%{pear_name}/examples/jquery.fade.js
+sed -i -e 's/\r//' $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/examples/jquery.fade.js
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -102,7 +99,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/HTTP/OAuth.php
 %{pear_phpdir}/HTTP/OAuth
@@ -110,6 +107,9 @@ fi
 
 
 %changelog
+* Sat Apr 16 2011 Remi Collet <Fedora at FamilleCollet.com> 0.2.2-3
+- doc in /usr/share/doc/pear
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-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",