[php-pear-DB-DataObject] update to 1.9.5

Remi Collet remi at fedoraproject.org
Fri Oct 8 18:40:33 UTC 2010


commit df664f4a96a4d25860a9f4b2256a3f8ee63f7ffc
Author: remi <fedora at famillecollet.com>
Date:   Fri Oct 8 20:40:09 2010 +0200

    update to 1.9.5

 .gitignore                  |    1 +
 php-pear-DB-DataObject.spec |   17 ++++++++++++-----
 sources                     |    2 +-
 xml2changelog               |   40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7da0ea..310f481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 DB_DataObject-1.8.12.tgz
 package.xml
+/DB_DataObject-1.9.5.tgz
diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec
index 7ad4a84..3daab6a 100644
--- a/php-pear-DB-DataObject.spec
+++ b/php-pear-DB-DataObject.spec
@@ -2,14 +2,15 @@
 %global pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.8.12
-Release:        2%{?dist}
+Version:        1.9.5
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Source2:        xml2changelog
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -37,6 +38,8 @@ your configuration files and your base classes.
 
 %prep
 %setup -qc
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
+
 # Create a "localized" php.ini to avoid build warning
 cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
@@ -52,13 +55,13 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
+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_docdir}/%{pear_name}/docs ../docdir
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -90,7 +93,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
+%doc CHANGELOG docdir/*
 %{_bindir}/createTables.php
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/DB/DataObject*
@@ -98,6 +101,10 @@ fi
 
 
 %changelog
+* Fri Oct 08 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.5-1
+- Version 1.9.5 (stable) - API 1.9.0 (stable)
+- add generated CHANGELOG
+
 * Sat Aug 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.8.12-2
 - clean define
 - remove LICENSE file (not provided by upstream)
diff --git a/sources b/sources
index 05aff2b..1434907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc50ac72ba214f4286e262c1b54ea9f0  DB_DataObject-1.8.12.tgz
+c8bc3c1644ed54498c9bbb62f82109e1  DB_DataObject-1.9.5.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