[php-pear-Mail-Mime/f14] update to 1.8.2 (bugfix)

[Remi Collet]

commit 745bbd5989a5e48416982b9b08bd39c35b347c6b
Author: remi <fedora at famillecollet.com>
Date:   Thu Aug 11 17:48:09 2011 +0200

    update to 1.8.2 (bugfix)

 .gitignore              |    2 ++
 php-pear-Mail-Mime.spec |   29 +++++++++++------------------
 sources                 |    2 +-
 xml2changelog           |   21 ++++++++++++---------
 4 files changed, 26 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 000e902..fa99e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+*spec~
 package*.xml
 Mail_Mime-1.7.0.tgz
 Mail_Mime-1.8.0.tgz
 /Mail_Mime-1.8.1.tgz
+/Mail_Mime-1.8.2.tgz
diff --git a/php-pear-Mail-Mime.spec b/php-pear-Mail-Mime.spec
index cd4a835..03895de 100644
--- a/php-pear-Mail-Mime.spec
+++ b/php-pear-Mail-Mime.spec
@@ -3,7 +3,7 @@
 %global pear_name Mail_Mime
 
 Name:           php-pear-Mail-Mime
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Summary:        Classes to create MIME messages
 
@@ -44,10 +44,6 @@ using RFC2047 and/or RFC2231.
 # package.xml is v2
 %{_bindir}/php -n %{SOURCE1} package.xml | tee CHANGELOG | head -n 8
 
-# 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 V2
 mv ../package.xml %{name}.xml
@@ -58,15 +54,12 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
-
-# Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name} ../docdir
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
-sed -i -e 's:@prefix@:%{_prefix}:' ../docdir/scripts/phail.php
+sed -i -e 's:@prefix@:%{_prefix}:' %{buildroot}%{pear_docdir}/%{pear_name}/scripts/phail.php
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -77,12 +70,8 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
-# Sanity check
-lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} \
+%{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
@@ -106,14 +95,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
-%{pear_datadir}/%{pear_name}
 %{pear_phpdir}/Mail
 
 
 %changelog
+* Thu Aug 11 2011 Remi Collet <Fedora at FamilleCollet.com> 1.8.2-1
+- Version 1.8.2 (stable) - API 1.4.1 (stable)
+- doc in /usr/share/doc/pear
+
 * Wed Dec  1 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.8.1-1
 - Version 1.8.1 (stable) - API 1.4.1 (stable)
 - use %%{pear_name} macro
diff --git a/sources b/sources
index 5ec1e56..66abbc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd3395dd4b602782ae65c7db1a48ca16  Mail_Mime-1.8.1.tgz
+ccd78c662816c95cf236b92d39ca985b  Mail_Mime-1.8.2.tgz
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",