commit f23d226ceb9463753c712ab0ac623c7e31d44123
Author: Jan Rękorajski <[email protected]>
Date: Thu Aug 27 15:46:40 2015 +0900
- fix building with latest libwbxml2
- rel 9
libwbxml.patch | 11 +++++++++++
php-pecl-wbxml.spec | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-wbxml.spec b/php-pecl-wbxml.spec
index f66a44f..7185a63 100644
--- a/php-pecl-wbxml.spec
+++ b/php-pecl-wbxml.spec
@@ -9,13 +9,14 @@ Summary: WBXML to XML conversion
Summary(pl.UTF-8): Konwersja WBXML do XML
Name: %{php_name}-pecl-%{modname}
Version: 1.0.3
-Release: 8
+Release: 9
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
+Patch2: libwbxml.patch
URL: http://pecl.php.net/package/wbxml/
BuildRequires: %{php_name}-devel >= 4:5.0.4
BuildRequires: libwbxml-devel
@@ -42,8 +43,10 @@ To rozszerzenie ma w PECL status: %{status}.
mv %{modname}-%{version}/* .
%patch0 -p0
%patch1 -p0
+%patch2 -p1
%build
+export CFLAGS="%{rpmcflags} `pkg-config --cflags libwbxml2`"
phpize
%configure
%{__make}
diff --git a/libwbxml.patch b/libwbxml.patch
new file mode 100644
index 0000000..1a242b7
--- /dev/null
+++ b/libwbxml.patch
@@ -0,0 +1,11 @@
+--- php53-pecl-wbxml-1.0.3/wbxml.c~ 2015-08-27 15:36:06.000000000 +0900
++++ php53-pecl-wbxml-1.0.3/wbxml.c 2015-08-27 15:37:23.135775590 +0900
+@@ -32,7 +32,7 @@
+ #endif
+
+ #undef HAVE_LIBXML
+-#include "wbxml.h"
++#include "wbxml/wbxml.h"
+
+ /* {{{ wbxml_functions[]
+ */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-wbxml.git/commitdiff/f23d226ceb9463753c712ab0ac623c7e31d44123
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
