rpms/php-pear-Log/EL-5 levels.patch, NONE, 1.1 php-pear-Log.spec, 1.6, 1.7 sources, 1.6, 1.7 xml2changelog, 1.2, 1.3

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Log/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27415

Modified Files:
	php-pear-Log.spec sources xml2changelog 
Added Files:
	levels.patch 
Log Message:
update to 1.9.16

levels.patch:

--- NEW FILE levels.patch ---
--- levels.phpt.orig	2008-01-20 08:19:09.000000000 +0100
+++ levels.phpt	2008-01-20 08:19:52.000000000 +0100
@@ -14,7 +14,7 @@
 
 function testLevels($mask)
 {
-    echo "Mask: $mask\n";
+    echo "Mask: ".($mask&0xffff)."\n";
 
     for ($priority = PEAR_LOG_EMERG; $priority <= PEAR_LOG_DEBUG; $priority++) {
         $masked = (Log::MASK($priority) & $mask);
@@ -33,7 +33,7 @@
 testLevels(Log::MAX(PEAR_LOG_WARNING));
 
 --EXPECT--
-Mask: -1
+Mask: 65535
 Priority 0: masked
 Priority 1: masked
 Priority 2: masked
@@ -53,7 +53,7 @@
 Priority 6: unmasked
 Priority 7: unmasked
 
-Mask: 2147483647
+Mask: 65535
 Priority 0: masked
 Priority 1: masked
 Priority 2: masked
@@ -73,7 +73,7 @@
 Priority 6: unmasked
 Priority 7: unmasked
 
-Mask: -16
+Mask: 65520
 Priority 0: unmasked
 Priority 1: unmasked
 Priority 2: unmasked


Index: php-pear-Log.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/EL-5/php-pear-Log.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Log.spec	2 Jan 2008 10:09:31 -0000	1.6
+++ php-pear-Log.spec	26 Jan 2008 17:02:46 -0000	1.7
@@ -4,12 +4,15 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.9.14
+Version:        1.9.16
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/Log-%{version}.tgz
 Source2:        xml2changelog
+
+Patch0:         levels.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:            http://pear.php.net/package/Log
 
@@ -47,6 +50,8 @@
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
+cp %{pear_name}-%{version}/tests/levels.phpt .
+%patch0 -p0
 
 %build
 # Empty build section
@@ -68,6 +73,10 @@
 popd
 # Sort out documentation
 mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
+mv %{buildroot}%{pear_docdir}/%{pear_name}/examples docdir/examples
+
+# patched test file
+install -m 644 levels.phpt %{buildroot}%{pear_testdir}/Log/tests
 
 
 %clean
@@ -107,6 +116,11 @@
 
 
 %changelog
+* Sat Jan 26 2008 Remi Collet <Fedora at FamilleCollet.com> 1.9.16-1
+- update to 1.9.16
+- add examples in documentation
+- add levels.patch http://pear.php.net/bugs/bug.php?id=12933
+
 * Wed Jan 02 2008 Remi Collet <Fedora at FamilleCollet.com> 1.9.14-1
 - update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2008 10:09:31 -0000	1.6
+++ sources	26 Jan 2008 17:02:46 -0000	1.7
@@ -1 +1 @@
-e0fbb9a7f3ab18dcf45b9d2c3af420a3  Log-1.9.14.tgz
+a481a77c9760d5fa3fc8ffd5bcf978bd  Log-1.9.16.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Log/EL-5/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	9 Jun 2007 08:22:54 -0000	1.2
+++ xml2changelog	26 Jan 2008 17:02:46 -0000	1.3
@@ -12,7 +12,8 @@
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
 
-	if (is_array($xml->changelog->release)) foreach($xml->changelog->release as $rel)
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
+	foreach($xml->changelog->release 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,