[php-symfony-YAML/f15] update to 1.0.6

[Remi Collet]

commit 8223fc88f505a4ed412e52b1cb1cefd69c0f0d7b
Author: remi <fedora at famillecollet.com>
Date:   Sat Jul 2 09:56:14 2011 +0200

    update to 1.0.6

 .gitignore            |    3 +++
 php-symfony-YAML.spec |   25 ++++++++++++-------------
 sources               |    2 +-
 xml2changelog         |   21 ++++++++++++---------
 4 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c026e6..889fd92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*~
 package*.xml
 YAML-1.0.3.tgz
 /YAML-1.0.4.tgz
+/YAML-1.0.5.tgz
+/YAML-1.0.6.tgz
diff --git a/php-symfony-YAML.spec b/php-symfony-YAML.spec
index 8ba4904..58e4d27 100644
--- a/php-symfony-YAML.spec
+++ b/php-symfony-YAML.spec
@@ -3,8 +3,8 @@
 %global channel pear.symfony-project.com
 
 Name:           php-symfony-YAML
-Version:        1.0.4
-Release:        2%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        The Symfony YAML Component
 
 Group:          Development/Libraries
@@ -33,12 +33,10 @@ PHP arrays. It can also converts PHP arrays to YAML strings.
 
 %prep
 %setup -q -c
+# Fix 1.0.5 release date http://trac.symfony-project.org/ticket/9545
+%{__sed} -i -e s/2010-02-22/2011-02-22/ package.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
@@ -50,13 +48,9 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
-
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -83,11 +77,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/SymfonyComponents
 %{pear_xmldir}/%{name}.xml
 
 %changelog
+* Sat Jul  2 2011 Remi Collet <Fedora at famillecollet.com> - 1.0.6-1
+- Version 1.0.6 (stable) - API 1.0.0 (stable)
+- move doc in /usr/share/doc/pear
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 4d0c033..96e286f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3af22829722c7eb0ffb0a995a3bb4a9  YAML-1.0.4.tgz
+9f010ddb236e1495ad3b9c42fbab9223  YAML-1.0.6.tgz
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..4c789f4 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",