diff --git a/.gitignore b/.gitignore
index 44adcf1..6814c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
XML_RSS-1.0.0.tgz
+package.xml
+/XML_RSS-1.0.1.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-XML-RSS.spec b/php-pear-XML-RSS.spec
index 3347ef0..47a895d 100644
--- a/php-pear-XML-RSS.spec
+++ b/php-pear-XML-RSS.spec
@@ -2,7 +2,7 @@
%global pear_name XML_RSS
Name: php-pear-XML-RSS
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
Summary: RSS parser
@@ -10,11 +10,15 @@ Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/XML_RSS
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)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+# For test suite
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires: php-pear(XML_Parser)
+
Requires: php-pear(PEAR)
Requires: php-pear(XML_Parser) > 1.0.1
Requires(post): %{__pear}
@@ -28,10 +32,15 @@ documents.
%prep
%setup -qc
-# package.xml is V2
-mv package.xml %{pear_name}-%{version}/%{name}.xml
-install -pm 644 -c %{SOURCE1} LICENSE
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
+# 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
%build
@@ -42,7 +51,7 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -53,10 +62,11 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%check
-# For documentation, after install:
-# cd /usr/share/pear/test/XML_RSS/tests ; phpunit .
-# With PHPUnit 3.4.11 and XML_RSS 1.0.0:
-# OK (9 tests, 19 assertions)
+cd %{pear_name}-%{version}
+phpunit \
+ -d date.timezone=UTC \
+ -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+ tests
%clean
@@ -77,13 +87,19 @@ fi
%files
%defattr(-,root,root,-)
-%doc LICENSE
+%doc CHANGELOG
%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/XML/RSS.php
%changelog
+* Mon Oct 25 2010 Remi Collet - 1.0.1-1
+- Version 1.0.1 (stable) - API 1.0.0 (stable)
+- add generated Changelog
+- define timezone during build
+- run tests in %%check
+
* Sun Mar 28 2010 Remi Collet - 1.0.0-1
- new upstream stable version
- rename XML_RSS.xml to php-pear-XML-RSS.xml
diff --git a/sources b/sources
index 2faa546..058b6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bb7dff5e55d4bc885344984aecd4dbc XML_RSS-1.0.0.tgz
+0d5419af419cda4afafab7bce3a68168 XML_RSS-1.0.1.tgz
diff --git a/xml2changelog b/xml2changelog
new file mode 100644
index 0000000..eb6bd31
--- /dev/null
+++ b/xml2changelog
@@ -0,0 +1,40 @@
+= "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);
+}
+?>