add patch to fix builds on distros that have libxml2 < 2.7.8

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlstarlet?expand=0&rev=14
This commit is contained in:
Pascal Bleser 2011-06-02 06:42:44 +00:00 committed by Git OBS Bridge
parent 403d1efda1
commit f4fd70f2c7
3 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,12 @@
--- src/xml_edit.c.orig 2011-06-02 08:33:48.440001384 +0200
+++ src/xml_edit.c 2011-06-02 08:35:40.246001357 +0200
@@ -431,7 +431,9 @@
{
xmlDocPtr doc;
int save_options =
+#if LIBXML_VERSION >= 20708
(g_ops.noblanks? 0 : XML_SAVE_WSNONSIG) |
+#endif
(g_ops.preserveFormat? 0 : XML_SAVE_FORMAT) |
(g_ops.omit_decl? XML_SAVE_NO_DECL : 0);
int read_options =

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 2 06:40:14 UTC 2011 - pascal.bleser@opensuse.org
- add xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch to fix builds
on distros that use libxml2 versions prior to 2.7.8 and which hence don't
support XML_SAVE_WSNONSIG
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 01 22:17:43 UTC 2011 - pascal.bleser@opensuse.org Wed Jun 01 22:17:43 UTC 2011 - pascal.bleser@opensuse.org

View File

@ -32,6 +32,8 @@ Group: Productivity/Publishing/XML
Source0: xmlstarlet-%{version}.tar.bz2 Source0: xmlstarlet-%{version}.tar.bz2
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
Patch2: %{name}-xml_depyx.c.diff Patch2: %{name}-xml_depyx.c.diff
# pbleser: backport for using libxml2 versions below 2.7.8 that do not support XML_SAVE_WSNONSIG
Patch3: xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/xmlstar/ Url: http://sourceforge.net/projects/xmlstar/
@ -50,6 +52,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch2 %patch2
%patch3
%build %build
export CFLAGS="$RPM_OPT_FLAGS -W -Wall" export CFLAGS="$RPM_OPT_FLAGS -W -Wall"