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

Remi Collet remi at fedoraproject.org
Sat Aug 4 14:56:45 UTC 2012


commit 39c379f870a7906f1d1037cc52d45bff7e648260
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 4 16:56:39 2012 +0200

    update to 1.10.0

 .gitignore                  |    1 +
 DB-DataObject.patch         |   24 ------------------------
 php-pear-DB-DataObject.spec |   21 ++++++++++++---------
 sources                     |    2 +-
 xml2changelog               |   21 ++++++++++++---------
 5 files changed, 26 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95734f8..2cd11bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 php-pear-DB-DataObject.spec~
 package-*.xml
 /DB_DataObject-1.9.6.tgz
+/DB_DataObject-1.10.0.tgz
diff --git a/php-pear-DB-DataObject.spec b/php-pear-DB-DataObject.spec
index 5e443d6..1302034 100644
--- a/php-pear-DB-DataObject.spec
+++ b/php-pear-DB-DataObject.spec
@@ -2,8 +2,8 @@
 %global pear_name DB_DataObject
 
 Name:           php-pear-DB-DataObject
-Version:        1.9.6
-Release:        3%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        An SQL Builder, Object Interface to Database Tables
 
 Group:          Development/Libraries
@@ -12,20 +12,21 @@ URL:            http://pear.php.net/package/DB_DataObject
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
-# http://pear.php.net/bugs/18767 hard coded path
-Patch0:         DB-DataObject.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear
 
 Requires:       php-pear(PEAR)
-Requires:       php-pear(DB) >= 1.7.0, 
+Requires:       php-pear(DB) >= 1.7.0
 Requires:       php-pear(Date) >= 1.4.3
 Requires:       php-pear(MDB2) >= 2.0.0
 Requires:       php-pear(Validate) >= 0.1.1
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
+# extensions detected by phpci
+Requires:       php-date, php-pcre, php-reflection, php-session
+# still optional, according to used driver: sqlite, mysql, pgsql
+
 Provides:       php-pear(%{pear_name}) = %{version}
 
 
@@ -47,8 +48,6 @@ cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
 
-%patch0 -p1 -b .old
-
 
 %build
 cd %{pear_name}-%{version}
@@ -72,6 +71,7 @@ chmod +x $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php
 ln -s ../..%{pear_phpdir}/DB/DataObject/createTables.php \
       $RPM_BUILD_ROOT%{_bindir}/createTables
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,6 +98,9 @@ fi
 
 
 %changelog
+* Sat Aug 04 2012 Remi Collet <Fedora at FamilleCollet.com> - 1.9.6-1
+- Version 1.10.0 (stable) - API 1.9.0 (stable)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index faedfbd..9769408 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-347550aba68c3fd2646f5ab4eaba9a14  DB_DataObject-1.9.6.tgz
+b15793c4c1260de9656405aaadd3878a  DB_DataObject-1.10.0.tgz
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