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-XML-Parser.spec b/php-pear-XML-Parser.spec
index e278b37..e6d99cc 100644
--- a/php-pear-XML-Parser.spec
+++ b/php-pear-XML-Parser.spec
@@ -5,12 +5,11 @@ Summary: XML parsing class based on PHP's bundled expat
Summary(fr): Une classe d'analyse XML utilisant l'extension expat de PHP
Name: php-pear-XML-Parser
Version: 1.2.8
-Release: 1%{?dist}
-License: PHP License
+Release: 2%{?dist}
+License: PHP
Group: Development/Libraries
URL: http://pear.php.net/package/XML_Parser
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)
@@ -19,7 +18,7 @@ BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-pear(PEAR) >= 1.4.9, php >= 4.2.0
+Requires: php-pear(PEAR) >= 1.4.9
Provides: php-pear(%{pear_name}) = %{version}
%description
@@ -54,7 +53,6 @@ XML_Parser pour analyser un document.
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-%{__install} -m 644 -c %{SOURCE1} LICENSE
%build
# Empty build section
@@ -98,7 +96,7 @@ fi
%files
%defattr(-,root,root,-)
-%doc CHANGELOG LICENSE docdir/examples
+%doc CHANGELOG docdir/examples
%{pear_phpdir}/XML/Parser
%{pear_phpdir}/XML/Parser.php
%{pear_testdir}/%{pear_name}
@@ -106,6 +104,9 @@ fi
%changelog
+* Fri Aug 24 2007 Remi Collet 1.2.8-2
+- Fix License
+
* Sat Dec 02 2006 Remi Collet 1.2.8-1
- update to 1.2.8
- remove PEAR from sumnary
diff --git a/xml2changelog b/xml2changelog
index d055fa5..3f7b42d 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -12,7 +12,7 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
$xml->version->api, $xml->stability->api,
$xml->date, $xml->notes);
- foreach($xml->changelog->release as $rel)
+ if (is_array($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,
$rel->version->api, $rel->stability->api,