From 2d34e9f243323efa719202705465f1eb3b8ffbfdd60b615dee3418174bd8cf00 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 16 Dec 2009 13:57:46 +0000
Subject: [PATCH] Accepting request 26657 from Publishing

Copy from Publishing/xmlstarlet based on submit request 26657 from user coolo

OBS-URL: https://build.opensuse.org/request/show/26657
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlstarlet?expand=0&rev=7
---
 xmlstarlet-0.9.5-configure_fix.diff     | 10 ++++++----
 xmlstarlet-1.0.0-no_static_linking.diff | 18 +++++++++---------
 xmlstarlet-xml_depyx.c.diff             |  8 +++++---
 xmlstarlet.changes                      |  5 +++++
 xmlstarlet.spec                         |  2 +-
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/xmlstarlet-0.9.5-configure_fix.diff b/xmlstarlet-0.9.5-configure_fix.diff
index b8a79ca..8c56a7a 100644
--- a/xmlstarlet-0.9.5-configure_fix.diff
+++ b/xmlstarlet-0.9.5-configure_fix.diff
@@ -1,8 +1,10 @@
---- configure.in
+Index: configure.in
+===================================================================
+--- configure.in.orig
 +++ configure.in
-@@ -7,7 +7,8 @@
- AM_MAINTAINER_MODE
+@@ -8,7 +8,8 @@ AM_MAINTAINER_MODE
  AC_CANONICAL_HOST
+ AC_PROG_CC
  
 -CFLAGS="-Wall -g -pedantic"
 +test ! -z $CFLAGS && CFLAGS="-Wall -g -pedantic"
@@ -10,7 +12,7 @@
  EXTRA_LIBS=
  
  case "${host}" in
-@@ -48,7 +49,7 @@
+@@ -51,7 +52,7 @@ AC_ARG_WITH(libxml-src,
          LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include"
  )
  
diff --git a/xmlstarlet-1.0.0-no_static_linking.diff b/xmlstarlet-1.0.0-no_static_linking.diff
index 973b850..53cb0a4 100644
--- a/xmlstarlet-1.0.0-no_static_linking.diff
+++ b/xmlstarlet-1.0.0-no_static_linking.diff
@@ -1,6 +1,8 @@
---- xmlstarlet-1.0.0/configure.in.orig	2005-01-28 03:40:06.000000000 +0100
-+++ xmlstarlet-1.0.0/configure.in	2005-01-31 11:52:36.589340662 +0100
-@@ -228,7 +228,7 @@
+Index: xmlstarlet-1.0.1/configure.in
+===================================================================
+--- xmlstarlet-1.0.1.orig/configure.in
++++ xmlstarlet-1.0.1/configure.in
+@@ -228,7 +228,7 @@ dnl Set LIBXML include path
  dnl
  if test "x$LIBXML_CFLAGS" = "x"
  then
@@ -9,7 +11,7 @@
  fi
  
  dnl
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ dnl Set LIBXML libraries location
  dnl
  if test "x$LIBXML_LIBS" = "x"
  then
@@ -18,7 +20,7 @@
  fi
  
  dnl
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ dnl Set LIBXSLT include path
  dnl
  if test "x$LIBXSLT_CFLAGS" = "x"
  then
@@ -27,7 +29,7 @@
  fi
  
  dnl
-@@ -252,13 +252,13 @@
+@@ -252,13 +252,13 @@ dnl Set LIBXSLT libraries location
  dnl
  if test "x$LIBXSLT_LIBS" = "x"
  then
@@ -43,7 +45,7 @@
  then
  	LIBICONV_CFLAGS="-I${LIBICONV_PREFIX}/include"
  fi
-@@ -266,7 +266,7 @@
+@@ -266,7 +266,7 @@ fi
  dnl
  dnl Set LIBICONV libraries location
  dnl
@@ -52,5 +54,3 @@
  then
  	LIBICONV_LIBS="-L${LIBXSLT_PREFIX}/lib"
  fi
-
-Diff finished.  Mon Jan 31 11:52:51 2005
diff --git a/xmlstarlet-xml_depyx.c.diff b/xmlstarlet-xml_depyx.c.diff
index b2342ea..c5f1ddc 100644
--- a/xmlstarlet-xml_depyx.c.diff
+++ b/xmlstarlet-xml_depyx.c.diff
@@ -1,6 +1,8 @@
---- src/xml_depyx.c.bak	2009-10-16 15:32:02.544001098 +0200
-+++ src/xml_depyx.c	2009-10-16 15:32:13.344501368 +0200
-@@ -214,6 +214,7 @@
+Index: src/xml_depyx.c
+===================================================================
+--- src/xml_depyx.c.orig
++++ src/xml_depyx.c
+@@ -214,6 +214,7 @@ pyxDePyx(char *file)
             }
         }
     }
diff --git a/xmlstarlet.changes b/xmlstarlet.changes
index 5798501..bd91a4b 100644
--- a/xmlstarlet.changes
+++ b/xmlstarlet.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 14 13:33:25 UTC 2009 - aj@suse.de
+
+- Reapply patches with fuzz=0
+
 -------------------------------------------------------------------
 Wed Oct 21 06:23:12 UTC 2009 - toms@suse.de
 
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index cca218e..22b5b27 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -22,7 +22,7 @@ Name:           xmlstarlet
 BuildRequires:  libxslt-devel pkgconfig sgml-skel
 Summary:        Command Line Tool to Process XML Documents
 Version:        1.0.1
-Release:        152
+Release:        153
 License:        MIT License (or similar)
 Group:          Productivity/Publishing/XML
 Source0:        http://ftp1.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.bz2