[php-pear-XML-RSS/f14/master] update to 1.0.1 - QA Release

Remi Collet remi at fedoraproject.org
Mon Oct 25 18:32:05 UTC 2010


commit c90d7509b479cb48f51a7fb49bfbd89c300e5508
Author: remi <fedora at famillecollet.com>
Date:   Mon Oct 25 20:30:01 2010 +0200

    update to 1.0.1 - QA Release

 .gitignore            |    2 +
 PHP-LICENSE-3.01      |   68 -------------------------------------------------
 php-pear-XML-RSS.spec |   38 +++++++++++++++++++--------
 sources               |    2 +-
 xml2changelog         |   40 ++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 80 deletions(-)
---
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-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 <Fedora at FamilleCollet.com> - 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 <Fedora at FamilleCollet.com> - 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 @@
+<?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