[php-pear-Mail-mimeDecode/f14/master] update to 1.5.5 (minor bugfix)

Remi Collet remi at fedoraproject.org
Thu Dec 2 17:55:56 UTC 2010


commit 3144e4d3a3c691344cd0ee6281f6197e6cf3338e
Author: remi <fedora at famillecollet.com>
Date:   Thu Dec 2 18:43:43 2010 +0100

    update to 1.5.5 (minor bugfix)

 .gitignore                    |    5 +--
 php-pear-Mail-mimeDecode.spec |   49 ++++++++++++++++++++++++----------------
 sources                       |    2 +-
 xml2changelog                 |   40 +++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0b7537..5dd8e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-Mail_mimeDecode-1.5.1.tgz
-/Mail_mimeDecode-1.5.3.tgz
-/Mail_mimeDecode-1.5.4.tgz
+package*xml
+/Mail_mimeDecode-1.5.5.tgz
diff --git a/php-pear-Mail-mimeDecode.spec b/php-pear-Mail-mimeDecode.spec
index e387094..3f08652 100644
--- a/php-pear-Mail-mimeDecode.spec
+++ b/php-pear-Mail-mimeDecode.spec
@@ -1,27 +1,28 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 
 %global pear_name Mail_mimeDecode
-Name:		php-pear-Mail-mimeDecode
-Version:	1.5.4
-Release:	1%{?dist}
-Summary:	Class to decode mime messages
-
-Group:		Development/Libraries
-License:	BSD
-URL:		http://pear.php.net/package/Mail_mimeDecode
-Source0:	http://pear.php.net/get/%{pear_name}-%{version}.tgz
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-BuildRequires:	php-pear >= 1:1.6.0
+Name:           php-pear-Mail-mimeDecode
+Version:        1.5.5
+Release:        1%{?dist}
+Summary:        Class to decode mime messages
+
+Group:          Development/Libraries
+License:        BSD
+URL:            http://pear.php.net/package/Mail_mimeDecode
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source1:        xml2changelog
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+BuildRequires:  php-pear >= 1:1.6.0
 # BR for tests
-BuildRequires:	php-pear(Mail_Mime) > 1.4.0
+BuildRequires:  php-pear(Mail_Mime) > 1.4.0
 
-Requires:	php-pear(PEAR) >= 1.6.0
-Requires:	php-pear(Mail_Mime) > 1.4.0
-Requires(post):	%{__pear}
+Requires:       php-pear(PEAR) >= 1.6.0
+Requires:       php-pear(Mail_Mime) > 1.4.0
+Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:	php-pear(%{pear_name}) = %{version}
+Provides:       php-pear(%{pear_name}) = %{version}
 
 
 %description
@@ -34,6 +35,8 @@ pear run-tests -p Mail_mimeDecode
 
 %prep
 %setup -q -c
+%{_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
@@ -73,7 +76,8 @@ lst=$(find %{buildroot}%{pear_xmldir} -exec grep -q %{buildroot} {} \; -print)
 # Test suite
 PHPRC=../php.ini %{__pear} run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
-   tests
+   tests | tee ../tests.log
+grep "FAILED TESTS" ../tests.log && exit 1
 
 
 %clean
@@ -87,18 +91,23 @@ rm -rf %{buildroot}
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
-	%{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null ||:
+ %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
+%doc CHANGELOG
 %{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Mail/mimeDecode.php
 
 
 %changelog
+* Thu Dec  2 2010 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-1
+- Version 1.5.5 (stable) - API 1.3.1 (stable)
+- add generated CHANGELOG
+
 * Tue Sep 14 2010 Remi Collet <Fedora at FamilleCollet.com> 1.5.4-1
 - update to 1.5.4 (Critical Security release)
 
diff --git a/sources b/sources
index 142cae8..48e92de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24cc3adf73ffaacc8bd52b92a2a77567  Mail_mimeDecode-1.5.4.tgz
+915bf1c68a5518afc14700d5b1132200  Mail_mimeDecode-1.5.5.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);
+}
+?>


More information about the scm-commits mailing list