[php-pear-XML-Serializer] fix FTBFS, update tests suite from git
Remi Collet
remi at fedoraproject.org
Mon Jan 16 10:39:22 UTC 2012
commit 378370bc94bb3acc3cd6a75af0e5160c37a65f87
Author: remi <fedora at famillecollet.com>
Date: Mon Jan 16 11:38:55 2012 +0100
fix FTBFS, update tests suite from git
.gitignore | 2 +-
XML_Serializer-svn.patch | 106 ++++++++++++++++++++++++++++++++++++++++++
php-pear-XML-Serializer.spec | 10 ++++-
xml2changelog | 21 +++++----
4 files changed, 128 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2438bdc..8ffd3a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-XML_Serializer-0.20.0.tgz
+*spec~
package2.xml
package.sig
package.xml
diff --git a/XML_Serializer-svn.patch b/XML_Serializer-svn.patch
new file mode 100644
index 0000000..820318a
--- /dev/null
+++ b/XML_Serializer-svn.patch
@@ -0,0 +1,106 @@
+diff -up XML_Serializer-0.20.2/php-pear-XML-Serializer.xml.orig XML_Serializer-0.20.2/php-pear-XML-Serializer.xml
+--- XML_Serializer-0.20.2/php-pear-XML-Serializer.xml.orig 2012-01-16 11:24:17.000000000 +0100
++++ XML_Serializer-0.20.2/php-pear-XML-Serializer.xml 2012-01-16 11:25:04.000000000 +0100
+@@ -67,7 +67,7 @@ Bug #17994 Installed into wrong path
+ <file baseinstalldir="/" md5sum="0016f26a5debc380cd52ccb909db69c5" name="examples/unserializeWithAttributes.php" role="doc" />
+ <file baseinstalldir="/" md5sum="99b0734f65e69d2c238bd264e907c8ad" name="examples/unserializeWithTagMap.php" role="doc" />
+ <file baseinstalldir="/" md5sum="654d663a079b527b2f28bff7367c38f4" name="examples/unserializeWithTypeGuessing.php" role="doc" />
+- <file baseinstalldir="/" md5sum="4e223031db1cea6e5ad476c57bd5599e" name="tests/AllTests.php" role="test" />
++ <file baseinstalldir="/" name="tests/AllTests.php" role="test" />
+ <file baseinstalldir="/" md5sum="fe84d63063f8584c124e7b325e2a9c83" name="tests/bug-9799.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="31f3d9ddc5d60d18ef10435deb6edd8f" name="tests/bug-12139.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="ddfbacabff784b57b84b4324ed94c8fb" name="tests/bug-13896.phpt" role="test" />
+diff -up XML_Serializer-0.20.2/tests/AllTests.php.orig XML_Serializer-0.20.2/tests/AllTests.php
+--- XML_Serializer-0.20.2/tests/AllTests.php.orig 2012-01-16 11:24:31.000000000 +0100
++++ XML_Serializer-0.20.2/tests/AllTests.php 2012-01-16 11:24:55.000000000 +0100
+@@ -45,40 +45,15 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
+ /*
+ * Files needed by PhpUnit
+ */
+-require_once 'PHPUnit/Framework.php';
+-require_once 'PHPUnit/TextUI/TestRunner.php';
+-require_once 'PHPUnit/Extensions/PhptTestSuite.php';
+-
+-/*
+- * You must add each additional class-level test suite file here
+- */
+-require_once 'Serializer_Arrays_TestCase.php';
+-require_once 'Serializer_Objects_TestCase.php';
+-require_once 'Serializer_Option_AttributesContent_TestCase.php';
+-require_once 'Serializer_Option_CDataSections_TestCase.php';
+-require_once 'Serializer_Option_ClassName_TestCase.php';
+-require_once 'Serializer_Option_Comment_TestCase.php';
+-require_once 'Serializer_Option_DefaultTag_TestCase.php';
+-require_once 'Serializer_Option_DocType_TestCase.php';
+-require_once 'Serializer_Option_EncodeFunc_TestCase.php';
+-require_once 'Serializer_Option_IgnoreNull_TestCase.php';
+-require_once 'Serializer_Option_Indent_TestCase.php';
+-require_once 'Serializer_Option_Linebreaks_TestCase.php';
+-require_once 'Serializer_Option_Mode_TestCase.php';
+-require_once 'Serializer_Option_Namespace_TestCase.php';
+-require_once 'Serializer_Option_ReturnResult_TestCase.php';
+-require_once 'Serializer_Option_RootAttributes_TestCase.php';
+-require_once 'Serializer_Option_RootName_TestCase.php';
+-require_once 'Serializer_Option_TagMap_TestCase.php';
+-require_once 'Serializer_Option_TypeHints_TestCase.php';
+-require_once 'Serializer_Option_XmlDeclaration_TestCase.php';
+-require_once 'Serializer_Scalars_TestCase.php';
+-require_once 'Unserializer_Arrays_TestCase.php';
+-require_once 'Unserializer_Objects_TestCase.php';
+-require_once 'Unserializer_Option_Encodings_TestCase.php';
+-require_once 'Unserializer_Option_GuessTypes_TestCase.php';
+-require_once 'Unserializer_Option_Whitespace_TestCase.php';
+-require_once 'Unserializer_Scalars_TestCase.php';
++if ($fp = @fopen('PHPUnit/Autoload.php', 'r', true)) {
++ require_once 'PHPUnit/Autoload.php';
++} elseif ($fp = @fopen('PHPUnit/Framework.php', 'r', true)) {
++ require_once 'PHPUnit/Framework.php';
++ require_once 'PHPUnit/TextUI/TestRunner.php';
++} else {
++ die('skip could not find PHPUnit');
++}
++fclose($fp);
+
+ /**
+ * directory where PHPT tests are located
+@@ -129,37 +104,9 @@ class XML_Serializer_AllTests
+ $suite = new PHPUnit_Framework_TestSuite(
+ 'XML_Serializer Full Suite of Unit Tests');
+
+- /*
+- * You must add each additional class-level test suite name here
+- */
+- $suite->addTestSuite('XML_Serializer_Arrays_TestCase');
+- $suite->addTestSuite('XML_Serializer_Objects_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_AttributesContent_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_CDataSections_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_ClassName_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_Comment_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_DefaultTag_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_DocType_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_EncodeFunc_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_IgnoreNull_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_Indent_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_Linebreaks_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_Mode_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_Namespace_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_ReturnResult_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_RootAttributes_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_RootName_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_TagMap_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_TypeHints_TestCase');
+- $suite->addTestSuite('XML_Serializer_Option_XmlDeclaration_TestCase');
+- $suite->addTestSuite('XML_Serializer_Scalars_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Arrays_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Objects_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Option_Encodings_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Option_GuessTypes_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Option_Whitespace_TestCase');
+- $suite->addTestSuite('XML_Unserializer_Scalars_TestCase');
+-
++ // Gather PHPUnit tests.
++ $dir = new GlobIterator(dirname(__FILE__) . '/*TestCase.php');
++ $suite->addTestFiles($dir);
+
+ /*
+ * add PHPT tests
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 0731645..e76eef3 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -3,7 +3,7 @@
Name: php-pear-XML-Serializer
Version: 0.20.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Swiss-army knife for reading and writing XML files
Group: Development/Libraries
@@ -12,6 +12,9 @@ URL: http://pear.php.net/package/XML_Serializer
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2: xml2changelog
+# http://svn.php.net/viewvc?view=revision&revision=321529
+Patch1: XML_Serializer-svn.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
@@ -43,6 +46,8 @@ cd %{pear_name}-%{version}
# package.xml is V2
mv ../package.xml %{name}.xml
+%patch1 -p1 -b .orig
+
%build
cd %{pear_name}-%{version}
@@ -97,6 +102,9 @@ fi
%changelog
+* Mon Jan 16 2012 Remi Collet <remi at fedoraproject.org> - 0.20.2-5
+- fix from SVN for test suite
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..3a31be6 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",
More information about the scm-commits
mailing list