From fd05bb9e2856b8f2574ad447cd532c0795f797b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Feb 15 2008 07:31:33 +0000 Subject: update to 1.2.11 --- diff --git a/.cvsignore b/.cvsignore index 0a03450..58283c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Net_SMTP-1.2.10.tgz +Net_SMTP-1.2.11.tgz diff --git a/PHP-LICENSE-3.01 b/PHP-LICENSE-3.01 deleted file mode 100644 index 8d3fa07..0000000 --- a/PHP-LICENSE-3.01 +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - ". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see . - -PHP includes the Zend Engine, freely available at -. diff --git a/php-pear-Net-SMTP.spec b/php-pear-Net-SMTP.spec index f72a1ad..d949082 100644 --- a/php-pear-Net-SMTP.spec +++ b/php-pear-Net-SMTP.spec @@ -2,16 +2,16 @@ %define pear_name Net_SMTP Name: php-pear-Net-SMTP -Version: 1.2.10 +Version: 1.2.11 Release: 1%{?dist} Summary: Provides an implementation of the SMTP protocol Summary(fr): Fournit une mise en oeuvre du protocol SMTP Group: Development/Libraries -License: PHP License +License: PHP URL: http://pear.php.net/package/Net_SMTP Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Source1: PHP-LICENSE-3.01 + Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,10 +38,9 @@ l'extension "php-pear-Auth-SASL". %prep %setup -q -c -%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG -%{__install} -m 644 -c %{SOURCE1} LICENSE +%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +mv package.xml %{pear_name}-%{version}/%{pear_name}.xml %build @@ -82,6 +81,7 @@ rm -rf %{buildroot} %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : + %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ @@ -91,13 +91,17 @@ fi %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE docdir/%{pear_name}/docs/* +%doc CHANGELOG docdir/%{pear_name}/docs/* %{pear_phpdir}/Net/* %{pear_testdir}/%{pear_name} %{pear_xmldir}/%{pear_name}.xml %changelog +* Fri Feb 15 2008 Remi Collet 1.2.11-1 +- update to 1.2.11 +- fix License + * Sat Mar 31 2007 Remi Collet 1.2.10-1 - remove PEAR from sumnary - update to 1.2.10 diff --git a/sources b/sources index 85d2f2d..c802633 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd12642ea13e2ec3939688b988fd39c4 Net_SMTP-1.2.10.tgz +1c3714c83d9d390215d06d3a60f40ebf Net_SMTP-1.2.11.tgz diff --git a/xml2changelog b/xml2changelog index d055fa5..0b3ed80 100644 --- a/xml2changelog +++ b/xml2changelog @@ -12,6 +12,7 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0 $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); + if (isset($xml->changelog->release) && count($xml->changelog->release)) foreach($xml->changelog->release as $rel) printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release,