[php-pear-XML-Serializer/f14/master] update to 0.20.2 - QA release
Remi Collet
remi at fedoraproject.org
Tue Oct 26 17:25:09 UTC 2010
commit d78d0c87c6b591421bb2ca38033eb07b55b54731
Author: remi <fedora at famillecollet.com>
Date: Tue Oct 26 19:25:06 2010 +0200
update to 0.20.2 - QA release
.gitignore | 4 +++
php-pear-XML-Serializer.spec | 55 +++++++++++++++++++++++++++++------------
sources | 2 +-
xml2changelog | 40 ++++++++++++++++++++++++++++++
4 files changed, 84 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19ace8c..2438bdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
XML_Serializer-0.20.0.tgz
+package2.xml
+package.sig
+package.xml
+/XML_Serializer-0.20.2.tgz
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 39b5750..47df42c 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -1,8 +1,8 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name XML_Serializer
+%global pear_name XML_Serializer
Name: php-pear-XML-Serializer
-Version: 0.20.0
+Version: 0.20.2
Release: 1%{?dist}
Summary: Swiss-army knife for reading and writing XML files
@@ -10,12 +10,20 @@ Group: Development/Libraries
License: BSD
URL: http://pear.php.net/package/XML_Serializer
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source2: xml2changelog
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
-Requires: php-pear(PEAR) php-pear(XML_Util) php-pear(XML_Parser)
+# for tests
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
+BuildRequires: php-pear(XML_Util) >= 1.1.1
+BuildRequires: php-pear(XML_Parser) >= 1.2.6
+Requires: php-xml
+
+Requires: php-pear(PEAR)
+Requires: php-pear(XML_Util) >= 1.1.1
+Requires: php-pear(XML_Parser) >= 1.2.6
Requires: php-xml
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -29,9 +37,15 @@ without the need for DOM.
%prep
%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+%{_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
@@ -40,14 +54,15 @@ cd %{pear_name}-%{version}
%install
-cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Move documentation
mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc docdir/%{pear_name}
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc/* ../docdir
+
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -62,11 +77,11 @@ rm -rf $RPM_BUILD_ROOT
%check
-# For documentation purpose only
-# After installation
-# cd /usr/share/pear/test/XML_Serializer/tests
-# phpunit AllTests
-# OK (73 tests, 75 assertions)
+cd %{pear_name}-%{version}/tests
+phpunit \
+ -d date.timezone=UTC \
+ -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+ AllTests
%post
@@ -83,13 +98,21 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/XML/*
%{pear_testdir}/%{pear_name}
%changelog
+* Tue Oct 26 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.20.2-1
+- Version 0.20.2 (beta) - API 0.20.0 (beta) - QA release
+- add generated Changelog
+- run phpunit test suite in %%check
+- clean define
+- set date.timezone during build
+- use version in "Requires".
+
* Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> 0.20.0-1
- update to 0.20.0
- License is BSD (since 0.19.0)
diff --git a/sources b/sources
index e88094e..31f0e4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba7ff28ac7a5b44a0bd9ced2a2c2c722 XML_Serializer-0.20.0.tgz
+e603e4b967510ed913f6c6b2dc59a2a1 XML_Serializer-0.20.2.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