From 18b78d9ca5c1335fd4332dd7635ba0d33546a38e Mon Sep 17 00:00:00 2001 From: remi Date: Apr 17 2011 06:00:56 +0000 Subject: update to 1.5.2 --- diff --git a/.gitignore b/.gitignore index 30b0b92..5527d45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ package*.xml /Net_SMTP-1.5.0.tgz /Net_SMTP-1.5.1.tgz +/Net_SMTP-1.5.2.tgz diff --git a/php-pear-Net-SMTP.spec b/php-pear-Net-SMTP.spec index 504c0c1..af84b47 100644 --- a/php-pear-Net-SMTP.spec +++ b/php-pear-Net-SMTP.spec @@ -2,7 +2,7 @@ %global pear_name Net_SMTP Name: php-pear-Net-SMTP -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} Summary: Provides an implementation of the SMTP protocol Summary(fr): Fournit une mise en Ĺ“uvre du protocole SMTP @@ -45,8 +45,6 @@ l'extension "php-pear-Auth-SASL". cp /etc/php.ini . echo "date.timezone=UTC" >>php.ini -%{__ln_s} %{pear_docdir}/%{pear_name} - cd %{pear_name}-%{version} # package.xml is V2 mv ../package.xml %{name}.xml @@ -105,13 +103,16 @@ fi %files %defattr(-,root,root,-) -%doc CHANGELOG %{pear_name} +%doc CHANGELOG %doc %{pear_docdir}/%{pear_name} %{pear_phpdir}/Net/* %{pear_testdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %changelog +* Sat Apr 17 2011 Remi Collet 1.5.2-1 +- Version 1.5.2 (stable) - API 1.1.3 (stable) + * Fri Mar 11 2011 Remi Collet 1.5.1-1 - Version 1.5.1 (stable) - API 1.1.3 (stable) - keep doc in pear_docdir diff --git a/sources b/sources index 36e6665..9fa17ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f97a5c3f73a7d8c7792f85fdd71fdac Net_SMTP-1.5.1.tgz +1c40f4a727b00707f7a1e108449e006c Net_SMTP-1.5.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",