Author: glen Date: Sun Jun 6 19:17:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fixes from mandriva; rel 3
---- Files affected:
packages/php-pecl-wbxml:
php-pecl-wbxml.spec (1.5 -> 1.6) ,
wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff (NONE ->
1.1) (NEW), wbxml-1.0.3-expat_fix.diff (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php-pecl-wbxml/php-pecl-wbxml.spec
diff -u packages/php-pecl-wbxml/php-pecl-wbxml.spec:1.5
packages/php-pecl-wbxml/php-pecl-wbxml.spec:1.6
--- packages/php-pecl-wbxml/php-pecl-wbxml.spec:1.5 Sun Jun 6 21:13:27 2010
+++ packages/php-pecl-wbxml/php-pecl-wbxml.spec Sun Jun 6 21:17:44 2010
@@ -9,11 +9,13 @@
Summary(pl.UTF-8): Konwersja WBXML do XML
Name: php-pecl-%{modname}
Version: 1.0.3
-Release: 2
+Release: 3
License: PHP
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
# Source0-md5: 9c6a4d347f9a2b4002ea0c83e4b14082
+Patch0:
wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff
+Patch1: wbxml-1.0.3-expat_fix.diff
URL: http://pecl.php.net/package/wbxml/
BuildRequires: libwbxml-devel
BuildRequires: php-devel >= 4:5.0.4
@@ -36,6 +38,8 @@
%prep
%setup -qc
mv %{modname}-%{version}/* .
+%patch0 -p0
+%patch1 -p0
%build
phpize
@@ -77,6 +81,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2010/06/06 19:17:44 glen
+- fixes from mandriva; rel 3
+
Revision 1.5 2010/06/06 19:13:27 glen
- unify, libwbxml-devel
================================================================
Index:
packages/php-pecl-wbxml/wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff
diff -u /dev/null
packages/php-pecl-wbxml/wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff:1.1
--- /dev/null Sun Jun 6 21:17:50 2010
+++
packages/php-pecl-wbxml/wbxml-1.0.2-format_not_a_string_literal_and_no_format_arguments.diff
Sun Jun 6 21:17:45 2010
@@ -0,0 +1,20 @@
+--- wbxml.c 2009-01-29 20:13:57.000000000 +0100
++++ wbxml.c.oden 2009-02-25 12:03:10.000000000 +0100
+@@ -204,7 +204,7 @@ PHP_FUNCTION(wbxml_encode)
+ RETVAL_STRINGL(wbxml, wbxml_len, 1);
+ }
+ else {
+- zend_error(E_WARNING, (const char
*)wbxml_errors_string(result));
++ zend_error(E_WARNING, "%s", (const char
*)wbxml_errors_string(result));
+ RETVAL_NULL();
+ }
+
+@@ -238,7 +238,7 @@ PHP_FUNCTION(wbxml_decode)
+ RETVAL_STRING(xml, 1);
+ }
+ else {
+- zend_error(E_WARNING, (const char
*)wbxml_errors_string(result));
++ zend_error(E_WARNING, "%s", (const char
*)wbxml_errors_string(result));
+ RETVAL_NULL();
+ }
+
================================================================
Index: packages/php-pecl-wbxml/wbxml-1.0.3-expat_fix.diff
diff -u /dev/null packages/php-pecl-wbxml/wbxml-1.0.3-expat_fix.diff:1.1
--- /dev/null Sun Jun 6 21:17:50 2010
+++ packages/php-pecl-wbxml/wbxml-1.0.3-expat_fix.diff Sun Jun 6 21:17:45 2010
@@ -0,0 +1,13 @@
+--- wbxml.c 2009-10-04 13:59:36.000000000 +0200
++++ wbxml.c.oden 2009-10-04 13:59:58.000000000 +0200
+@@ -27,6 +27,10 @@
+ #include "ext/standard/info.h"
+ #include "php_wbxml.h"
+
++#ifdef HAVE_EXPAT
++#include "expat.h"
++#endif
++
+ #undef HAVE_LIBXML
+ #include "wbxml.h"
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-wbxml/php-pecl-wbxml.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
