From 0022b058a76cf6d8adda22a1abbcedb36fe41bc3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 15:06:17 +0000 Subject: [PATCH 01/70] Initialize branch F-8 for xmlstarlet --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 4cf0096d56f6db53663270b2c4b51cd10f3b24f8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 19:06:03 +0000 Subject: [PATCH 02/70] - Autorebuild for GCC 4.3 --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 7437cc7..0b9f1c9 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 +- Autorebuild for GCC 4.3 + * Sat Sep 2 2006 Paul W. Frields - 1.0.1-4 - Bump release for FC6 mass rebuild From 19b5dd73d2db0bb83628f7787ba7d5d423ee27e7 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 21 Mar 2008 20:58:18 +0000 Subject: [PATCH 03/70] Rebuild to use FORTIFY_SOURCE correctly --- xmlstarlet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 0b9f1c9..e53da9f 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -30,7 +30,7 @@ commands. %build autoreconf -i %configure -make +make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml xmlto html-nochunks xmlstarlet-ug.xml @@ -39,8 +39,8 @@ xmlto html-nochunks xmlstarlet-ug.xml %install rm -fr %{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT -%makeinstall %clean rm -fr %{buildroot} @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Fri Mar 21 2008 Paul W. Frields - 1.0.1-6 +- Rebuild to use FORTIFY_SOURCE correctly + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 - Autorebuild for GCC 4.3 From c24a4519824f2f0a634f165e9879de382304ba26 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 22 Mar 2008 12:09:40 +0000 Subject: [PATCH 04/70] Sync with devel changes for FORTIFY_SOURCE --- xmlstarlet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 7437cc7..8824cfb 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -30,7 +30,7 @@ commands. %build autoreconf -i %configure -make +make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml xmlto html-nochunks xmlstarlet-ug.xml @@ -39,8 +39,8 @@ xmlto html-nochunks xmlstarlet-ug.xml %install rm -fr %{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT -%makeinstall %clean rm -fr %{buildroot} @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Sat Mar 22 2008 Paul W. Frields - 1.0.1-5 +- Rebuild to use FORTIFY_SOURCE correctly + * Sat Sep 2 2006 Paul W. Frields - 1.0.1-4 - Bump release for FC6 mass rebuild From ec04e05cbe2163807995a09558fffc8601679cec Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 10:06:23 +0000 Subject: [PATCH 05/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index e53da9f..f0b972d 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Mar 21 2008 Paul W. Frields - 1.0.1-6 - Rebuild to use FORTIFY_SOURCE correctly From 803aaaedce269929e16d5fd356107b34791dca73 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:12:56 +0000 Subject: [PATCH 06/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index f0b972d..e988173 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From fceb4fc80dcc1ab6129188fd96b8dd06a15bc7e8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:00 +0000 Subject: [PATCH 07/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51980bb..91fffe2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmlstarlet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6a5f3100e690d9b8644f3dcb7819eba02d3fb98f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:28 +0000 Subject: [PATCH 08/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 51980bb..91fffe2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmlstarlet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 40f234e5d9eb8647163061b789f8f3e5e2053d35 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 10 Jan 2010 18:03:40 +0000 Subject: [PATCH 09/70] Correct source URL in devel and active releases --- xmlstarlet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index e988173..9ef1863 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,11 +1,11 @@ Name: xmlstarlet Version: 1.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT URL: http://xmlstar.sourceforge.net/ -Source0: http://dl.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz Patch0: xmlstarlet-1.0.1-nostatic.patch Patch1: xmlstarlet-1.0.1-cmdname.patch Patch2: xmlstarlet-1.0.1-docs.patch @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Sun Jan 10 2010 Paul W. Frields - 1.0.1-9 +- Correct source URL + * Mon Jul 27 2009 Fedora Release Engineering - 1.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From bf817ab6e6d75fe2e528777566a0e40e6460e47a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:57:20 +0000 Subject: [PATCH 10/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 91fffe2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlstarlet -# $Id$ -NAME := xmlstarlet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From e0d2d50ee02bc9c0e09a197f2253365ea13951f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:57:27 +0000 Subject: [PATCH 11/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 91fffe2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlstarlet -# $Id$ -NAME := xmlstarlet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 75dbd54b60370df3e787e2b5190620b3e3275628 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Mon, 1 Nov 2010 14:30:16 -0400 Subject: [PATCH 12/70] - Update to new upstream 1.0.2 --- .gitignore | 1 + sources | 2 +- xmlstarlet.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 911be84..e55af3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xmlstarlet-1.0.1.tar.gz +/xmlstarlet-1.0.2.tar.gz diff --git a/sources b/sources index a412660..71d1344 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8deb71834bcdfb4443c258a1f0042fce xmlstarlet-1.0.1.tar.gz +cc6031201cb263ab364ee5bfbe503cb5 xmlstarlet-1.0.2.tar.gz diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 9ef1863..fca5e37 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet -Version: 1.0.1 -Release: 9%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -29,7 +29,7 @@ commands. %build autoreconf -i -%configure +%configure --with-libxml-prefix=%{_prefix} --with-libxslt-prefix=%{_prefix} make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml @@ -54,6 +54,9 @@ rm -fr %{buildroot} %changelog +* Mon Nov 1 2010 Paul W. Frields - 1.0.2-1 +- Update to new upstream 1.0.2 + * Sun Jan 10 2010 Paul W. Frields - 1.0.1-9 - Correct source URL From a03a18f667412dd3be17794188dd3d70f04d4ca8 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 18 Dec 2010 12:01:59 -0500 Subject: [PATCH 13/70] Update to 1.0.3, fixing patches and validation testing --- .gitignore | 1 + sources | 2 +- xmlstarlet-1.0.1-nostatic.patch | 75 ----------- xmlstarlet-1.0.3-bigxmldtd-results.patch | 5 + ...me.patch => xmlstarlet-1.0.3-cmdname.patch | 121 +++++++++--------- xmlstarlet-1.0.3-nostatic.patch | 28 ++++ xmlstarlet.spec | 18 ++- 7 files changed, 111 insertions(+), 139 deletions(-) delete mode 100644 xmlstarlet-1.0.1-nostatic.patch create mode 100644 xmlstarlet-1.0.3-bigxmldtd-results.patch rename xmlstarlet-1.0.1-cmdname.patch => xmlstarlet-1.0.3-cmdname.patch (61%) create mode 100644 xmlstarlet-1.0.3-nostatic.patch diff --git a/.gitignore b/.gitignore index e55af3c..80e915d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmlstarlet-1.0.1.tar.gz /xmlstarlet-1.0.2.tar.gz +/xmlstarlet-1.0.3.tar.gz diff --git a/sources b/sources index 71d1344..685a30e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc6031201cb263ab364ee5bfbe503cb5 xmlstarlet-1.0.2.tar.gz +ec9a39540b402affcb99a07f0a03d92a xmlstarlet-1.0.3.tar.gz diff --git a/xmlstarlet-1.0.1-nostatic.patch b/xmlstarlet-1.0.1-nostatic.patch deleted file mode 100644 index c67f216..0000000 --- a/xmlstarlet-1.0.1-nostatic.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvsroot/xmlstar/xmlstarlet/configure.in,v -retrieving revision 1.58 -diff -u -p -r1.58 configure.in ---- old/configure.in 19 Mar 2005 01:55:22 -0000 1.58 -+++ new/configure.in 21 Nov 2005 18:20:42 -0000 -@@ -31,7 +31,7 @@ AC_ARG_WITH(libxml-prefix, - [ --with-libxml-prefix=[PFX] Specify location of libxml], - LIBXML_PREFIX=$withval - LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml" -- LIBXML_LIBS="$withval/lib/libxml2.a -lz -lm -lpthread -ldl" -+ LIBXML_LIBS="-L$withval/lib -lxml2 -lz -lm -ldl" - ) - - AC_ARG_WITH(libxml-include-prefix, -@@ -41,13 +41,13 @@ AC_ARG_WITH(libxml-include-prefix, - - AC_ARG_WITH(libxml-libs-prefix, - [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs], -- LIBXML_LIBS="$withval/libxml2.a -lz -lm -lpthread -ldl" -+ LIBXML_LIBS="-L$withval -lxml2 -lz -lm -ldl" - ) - - AC_ARG_WITH(libxml-src, - [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], - LIBXML_SRC="$withval" -- LIBXML_LIBS="$withval/.libs/libxml2.a -lz -lm -lpthread" -+ LIBXML_LIBS="-L$withval/.libs -lxml2 -lz -lm" - LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include" - ) - -@@ -74,7 +74,7 @@ AC_ARG_WITH(libxslt-prefix, - [ --with-libxslt-prefix=[PFX] Specify location of libxslt], - LIBXSLT_PREFIX=$withval - LIBXSLT_CFLAGS="-I$withval/include/libxslt -I$withval/include/libexslt" -- LIBXSLT_LIBS="$withval/lib/libxslt.a $withval/lib/libexslt.a -lz -lm -lpthread" -+ LIBXSLT_LIBS="-L$withval/lib -lxslt -L$withval/lib -lexslt -lz -lm" - ) - - AC_ARG_WITH(libxslt-include-prefix, -@@ -84,13 +84,13 @@ AC_ARG_WITH(libxslt-include-prefix, - - AC_ARG_WITH(libxslt-libs-prefix, - [ --with-libxslt-libs-prefix=[PFX] Specify location of libxslt libs], -- LIBXSLT_LIBS="$withval/libxslt.a $withval/libexslt.a -lz -lm -lpthread" -+ LIBXSLT_LIBS="-L$withval -lxslt -L$withval -lexslt -lz -lm" - ) - - AC_ARG_WITH(libxslt-src, - [ --with-libxslt-src=[DIR] For libxslt thats not installed yet (sets all three above)], - LIBXSLT_SRC="$withval" -- LIBXSLT_LIBS="$withval/libxslt/.libs/libxslt.a $withval/libexslt/.libs/libexslt.a -lz -lm -lpthread" -+ LIBXSLT_LIBS="-L$withval/libxslt/.libs -lxslt -L$withval/libexslt/.libs -lexslt -lz -lm" - LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval" - ) - -@@ -236,7 +236,7 @@ dnl Set LIBXML libraries location - dnl - if test "x$LIBXML_LIBS" = "x" - then -- LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl" -+ LIBXML_LIBS="-L${LIBXML_PREFIX}/lib -lxml2 -lz -lm -ldl" - fi - - dnl -@@ -252,7 +252,7 @@ dnl Set LIBXSLT libraries location - dnl - if test "x$LIBXSLT_LIBS" = "x" - then -- LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.a ${LIBXSLT_PREFIX}/lib/libexslt.a -lz -lm -lpthread" -+ LIBXSLT_LIBS="-L${LIBXSLT_PREFIX}/lib -lxslt -L${LIBXSLT_PREFIX}/lib -lexslt -lz -lm" - fi - - dnl diff --git a/xmlstarlet-1.0.3-bigxmldtd-results.patch b/xmlstarlet-1.0.3-bigxmldtd-results.patch new file mode 100644 index 0000000..1545a0f --- /dev/null +++ b/xmlstarlet-1.0.3-bigxmldtd-results.patch @@ -0,0 +1,5 @@ +--- xmlstarlet-1.0.3-original/examples/results/bigxml-dtd.out 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/examples/results/bigxml-dtd.out 2010-12-18 08:10:21.257959145 -0500 +@@ -1 +1 @@ +--:7000x ++-:6553x diff --git a/xmlstarlet-1.0.1-cmdname.patch b/xmlstarlet-1.0.3-cmdname.patch similarity index 61% rename from xmlstarlet-1.0.1-cmdname.patch rename to xmlstarlet-1.0.3-cmdname.patch index 7e4ad82..7382b99 100644 --- a/xmlstarlet-1.0.1-cmdname.patch +++ b/xmlstarlet-1.0.3-cmdname.patch @@ -1,45 +1,24 @@ -Index: xmlstarlet.spec.in -=================================================================== -RCS file: /cvsroot/xmlstar/xmlstarlet/xmlstarlet.spec.in,v -retrieving revision 1.9 -diff -u -p -r1.9 xmlstarlet.spec.in ---- old/xmlstarlet.spec.in 1 Feb 2004 23:21:25 -0000 1.9 -+++ new/xmlstarlet.spec.in 21 Nov 2005 18:20:42 -0000 -@@ -43,6 +43,6 @@ rm -fr %{buildroot} - %doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet.pdf - %doc %{_mandir}/man1/xmlstarlet.1* +diff -uNr xmlstarlet-1.0.3-original/examples/xmlstarlet xmlstarlet-1.0.3/examples/xmlstarlet +--- xmlstarlet-1.0.3-original/examples/xmlstarlet 2010-11-10 18:42:26.000000000 -0500 ++++ xmlstarlet-1.0.3/examples/xmlstarlet 2010-12-17 12:09:15.644655135 -0500 +@@ -1,4 +1,4 @@ + #!/bin/sh --%{prefix}/bin/xml -+%{prefix}/bin/xmlstarlet - %changelog - -Index: src/Makefile.am -=================================================================== -RCS file: /cvsroot/xmlstar/xmlstarlet/src/Makefile.am,v -retrieving revision 1.21 -diff -u -p -r1.21 Makefile.am ---- old/src/Makefile.am 21 Nov 2004 20:18:49 -0000 1.21 -+++ new/src/Makefile.am 21 Nov 2005 18:20:42 -0000 -@@ -2,12 +2,12 @@ INCLUDES = -I. -I$(top_srcdir) -I$(top_s - -I$(top_builddir) -I$(top_builddir)/src \ - $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(LIBICONV_CFLAGS) $(CFLAGS) +-../src/xml ${@+"$@"} ++../src/xmlstarlet ${@+"$@"} +diff -uNr xmlstarlet-1.0.3-original/src/Makefile.am xmlstarlet-1.0.3/src/Makefile.am +--- xmlstarlet-1.0.3-original/src/Makefile.am 2010-11-16 20:43:53.000000000 -0500 ++++ xmlstarlet-1.0.3/src/Makefile.am 2010-12-17 12:08:55.760085370 -0500 +@@ -1,3 +1,3 @@ -bin_PROGRAMS = xml +bin_PROGRAMS = xmlstarlet -xml_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c --xml_LDFLAGS = --xml_DEPENDENCIES = $(DEPS) --xml_LDADD = $(LDADDS) +xmlstarlet_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c -+xmlstarlet_LDFLAGS = -+xmlstarlet_DEPENDENCIES = $(DEPS) -+xmlstarlet_LDADD = $(LDADDS) - - EXTRA_DIST = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c - ---- xmlstarlet-1.0.1-original/src/xml.c 2004-11-10 22:39:34.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml.c 2005-11-22 18:29:58.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c +--- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500 @@ -49,7 +49,7 @@ */ static const char usage_str_1[] = @@ -58,8 +37,9 @@ diff -u -p -r1.21 Makefile.am ---- xmlstarlet-1.0.1-original/src/xml_C14N.c 2004-11-23 22:00:10.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_C14N.c 2005-11-22 18:32:14.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_C14N.c xmlstarlet-1.0.3/src/xml_C14N.c +--- xmlstarlet-1.0.3-original/src/xml_C14N.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_C14N.c 2010-12-17 12:08:55.761085249 -0500 @@ -34,7 +34,7 @@ static const char c14n_usage_str_1[] = @@ -69,8 +49,9 @@ diff -u -p -r1.21 Makefile.am "where\n" " - input XML document file name (stdin is used if '-')\n" " - XML file containing XPath expression for\n" ---- xmlstarlet-1.0.1-original/src/xml_depyx.c 2005-03-11 22:24:23.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_depyx.c 2005-11-22 18:32:24.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_depyx.c xmlstarlet-1.0.3/src/xml_depyx.c +--- xmlstarlet-1.0.3-original/src/xml_depyx.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_depyx.c 2010-12-17 12:08:55.762085127 -0500 @@ -38,7 +38,7 @@ static const char depyx_usage_str[] = @@ -80,9 +61,10 @@ diff -u -p -r1.21 Makefile.am "where\n" " - input PYX document file name (stdin is used if missing)\n\n" "The PYX format is a line-oriented representation of\n" ---- xmlstarlet-1.0.1-original/src/xml_edit.c 2005-01-07 19:07:03.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_edit.c 2005-11-22 18:32:36.000000000 -0500 -@@ -108,7 +108,7 @@ +diff -uNr xmlstarlet-1.0.3-original/src/xml_edit.c xmlstarlet-1.0.3/src/xml_edit.c +--- xmlstarlet-1.0.3-original/src/xml_edit.c 2010-11-14 11:18:43.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_edit.c 2010-12-17 12:08:55.762085127 -0500 +@@ -109,7 +109,7 @@ */ static const char edit_usage_str_1[] = "XMLStarlet Toolkit: Edit XML document(s)\n" @@ -91,8 +73,9 @@ diff -u -p -r1.21 Makefile.am "where\n" " - global options for editing\n" " - input XML document file name/uri (stdin otherwise)\n\n"; ---- xmlstarlet-1.0.1-original/src/xml_elem.c 2004-11-21 18:40:40.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_elem.c 2005-11-22 18:32:45.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_elem.c xmlstarlet-1.0.3/src/xml_elem.c +--- xmlstarlet-1.0.3-original/src/xml_elem.c 2010-11-10 18:42:26.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_elem.c 2010-12-17 12:08:55.763085005 -0500 @@ -67,7 +67,7 @@ static const char elem_usage_str[] = @@ -102,8 +85,9 @@ diff -u -p -r1.21 Makefile.am "where\n" " - input XML document file name (stdin is used if missing)\n" " is one of:\n" ---- xmlstarlet-1.0.1-original/src/xml_escape.c 2004-11-21 18:40:40.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_escape.c 2005-11-22 18:32:52.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_escape.c xmlstarlet-1.0.3/src/xml_escape.c +--- xmlstarlet-1.0.3-original/src/xml_escape.c 2010-11-10 18:42:26.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_escape.c 2010-12-17 12:08:55.763085005 -0500 @@ -52,7 +52,7 @@ static const char escape_usage_str[] = @@ -113,9 +97,10 @@ diff -u -p -r1.21 Makefile.am "where are\n" " --help - print usage\n" " (TODO: more to be added in future)\n" ---- xmlstarlet-1.0.1-original/src/xml_format.c 2005-01-06 21:33:40.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_format.c 2005-11-22 18:32:59.000000000 -0500 -@@ -72,7 +72,7 @@ +diff -uNr xmlstarlet-1.0.3-original/src/xml_format.c xmlstarlet-1.0.3/src/xml_format.c +--- xmlstarlet-1.0.3-original/src/xml_format.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_format.c 2010-12-17 12:08:55.764084881 -0500 +@@ -73,7 +73,7 @@ */ static const char format_usage_str_1[] = "XMLStarlet Toolkit: Format XML document\n" @@ -124,8 +109,9 @@ diff -u -p -r1.21 Makefile.am "where are\n" " -n or --noindent - do not indent\n" " -t or --indent-tab - indent output with tabulation\n" ---- xmlstarlet-1.0.1-original/src/xml_ls.c 2005-03-11 22:49:41.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_ls.c 2005-11-22 18:33:07.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_ls.c xmlstarlet-1.0.3/src/xml_ls.c +--- xmlstarlet-1.0.3-original/src/xml_ls.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_ls.c 2010-12-17 12:08:55.764084881 -0500 @@ -44,7 +44,7 @@ static const char ls_usage_str[] = @@ -135,8 +121,9 @@ diff -u -p -r1.21 Makefile.am "Lists current directory in XML format.\n" "Time is shown per ISO 8601 spec.\n" "\n"; ---- xmlstarlet-1.0.1-original/src/xml_pyx.c 2005-03-11 22:24:23.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_pyx.c 2005-11-22 18:33:13.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_pyx.c xmlstarlet-1.0.3/src/xml_pyx.c +--- xmlstarlet-1.0.3-original/src/xml_pyx.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_pyx.c 2010-12-17 12:08:55.765084757 -0500 @@ -23,7 +23,7 @@ */ static const char pyx_usage_str_1[] = @@ -146,8 +133,9 @@ diff -u -p -r1.21 Makefile.am "where\n" " - input XML document file name (stdin is used if missing)\n\n"; ---- xmlstarlet-1.0.1-original/src/xml_select.c 2005-01-06 21:02:13.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_select.c 2005-11-22 18:39:29.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_select.c xmlstarlet-1.0.3/src/xml_select.c +--- xmlstarlet-1.0.3-original/src/xml_select.c 2010-11-13 11:56:13.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_select.c 2010-12-17 12:08:55.765084757 -0500 @@ -65,7 +65,7 @@ */ static const char select_usage_str_1[] = @@ -168,8 +156,9 @@ diff -u -p -r1.21 Makefile.am "is equivalent to applying the following XSLT\n\n"; ---- xmlstarlet-1.0.1-original/src/xml_trans.c 2005-01-06 21:40:59.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_trans.c 2005-11-22 18:33:29.000000000 -0500 +diff -uNr xmlstarlet-1.0.3-original/src/xml_trans.c xmlstarlet-1.0.3/src/xml_trans.c +--- xmlstarlet-1.0.3-original/src/xml_trans.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_trans.c 2010-12-17 12:08:55.767084511 -0500 @@ -47,7 +47,7 @@ */ static const char trans_usage_str_1[] = @@ -179,9 +168,10 @@ diff -u -p -r1.21 Makefile.am "where\n" " - main XSLT stylesheet for transformation\n" " - input XML document file/URL (stdin is used if missing)\n"; ---- xmlstarlet-1.0.1-original/src/xml_validate.c 2005-01-06 20:52:43.000000000 -0500 -+++ xmlstarlet-1.0.1/src/xml_validate.c 2005-11-22 18:33:37.000000000 -0500 -@@ -68,7 +68,7 @@ +diff -uNr xmlstarlet-1.0.3-original/src/xml_validate.c xmlstarlet-1.0.3/src/xml_validate.c +--- xmlstarlet-1.0.3-original/src/xml_validate.c 2010-11-14 10:47:45.000000000 -0500 ++++ xmlstarlet-1.0.3/src/xml_validate.c 2010-12-17 12:08:55.768084391 -0500 +@@ -78,7 +78,7 @@ */ static const char validate_usage_str_1[] = "XMLStarlet Toolkit: Validate XML document(s)\n" @@ -190,3 +180,14 @@ diff -u -p -r1.21 Makefile.am "where \n" " -w or --well-formed - validate well-formedness only (default)\n" " -d or --dtd - validate against DTD\n"; +diff -uNr xmlstarlet-1.0.3-original/xmlstarlet.spec.in xmlstarlet-1.0.3/xmlstarlet.spec.in +--- xmlstarlet-1.0.3-original/xmlstarlet.spec.in 2010-11-10 18:42:26.000000000 -0500 ++++ xmlstarlet-1.0.3/xmlstarlet.spec.in 2010-12-17 12:08:55.768084391 -0500 +@@ -43,6 +43,6 @@ + %doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet.pdf + %doc %{_mandir}/man1/xmlstarlet.1* + +-%{prefix}/bin/xml ++%{prefix}/bin/xmlstarlet + %changelog + diff --git a/xmlstarlet-1.0.3-nostatic.patch b/xmlstarlet-1.0.3-nostatic.patch new file mode 100644 index 0000000..0de311d --- /dev/null +++ b/xmlstarlet-1.0.3-nostatic.patch @@ -0,0 +1,28 @@ +diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac +--- xmlstarlet-1.0.3-original/configure.ac 2010-11-17 14:47:55.000000000 -0500 ++++ xmlstarlet-1.0.3/configure.ac 2010-12-17 11:59:27.090514304 -0500 +@@ -29,18 +29,18 @@ + XSTAR_LIB_CHECK([LIBXML], [xml2-config]) + AS_IF([test "x$LIBXML_SRCDIR" != x], + [LIBXML_INCDIR="$LIBXML_SRCDIR/include"], +- [: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}]) +-[LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"] +-[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"] ++ [: ${LIBXML_INCDIR="`xml2-config --cflags`"}]) ++[LIBXML_LIBS="`xml2-config --libs`"] ++[LIBXML_CPPFLAGS="-DLIBXML_STATIC $LIBXML_INCDIR"] + + XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) + [: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}] + AS_IF([test "x$LIBXSLT_SRCDIR" != x], + [LIBXSLT_INCDIR="$LIBXSLT_SRCDIR" + LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"], +- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"]) +-[: ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}] +-[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"] ++ [LIBXSLT_LIBS="`xslt-config --libs` -lexslt"]) ++[: ${LIBSLT_INCDIR="`xslt-config --cflags`"}] ++[LIBXSLT_CPPFLAGS="$LIBXSLT_INCDIR"] + + [WIN32_EXTRA_LDFLAGS=] + [WIN32_EXTRA_LIBS=] diff --git a/xmlstarlet.spec b/xmlstarlet.spec index fca5e37..b7344d8 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,14 +1,15 @@ Name: xmlstarlet -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT URL: http://xmlstar.sourceforge.net/ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz -Patch0: xmlstarlet-1.0.1-nostatic.patch -Patch1: xmlstarlet-1.0.1-cmdname.patch +Patch0: xmlstarlet-1.0.3-nostatic.patch +Patch1: xmlstarlet-1.0.3-cmdname.patch Patch2: xmlstarlet-1.0.1-docs.patch +Patch3: xmlstarlet-1.0.3-bigxmldtd-results.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmlto automake autoconf libxml2-devel libxslt-devel @@ -26,6 +27,8 @@ commands. %patch0 -p1 -b .nostatic %patch1 -p1 -b .cmdname %patch2 -p1 -b .docs +# Refer to https://bugzilla.gnome.org/show_bug.cgi?id=325533 +%patch3 -p1 -b .bigxmldtd-results %build autoreconf -i @@ -42,6 +45,11 @@ rm -fr %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT +%check +cd tests +./runTests + + %clean rm -fr %{buildroot} @@ -54,6 +62,10 @@ rm -fr %{buildroot} %changelog +* Fri Dec 17 2010 Paul W. Frields - 1.0.3-1 +- Update to new upstream 1.0.3 +- Add %%check section for validation testing + * Mon Nov 1 2010 Paul W. Frields - 1.0.2-1 - Update to new upstream 1.0.2 From 4150c3da2191f3ed33b236ab0593a11845fe30bc Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 18 Dec 2010 12:33:06 -0500 Subject: [PATCH 14/70] Remove unnecessary flags and fix use of libdir instead --- xmlstarlet-1.0.3-nostatic.patch | 2 +- xmlstarlet.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlstarlet-1.0.3-nostatic.patch b/xmlstarlet-1.0.3-nostatic.patch index 0de311d..5a4c8d3 100644 --- a/xmlstarlet-1.0.3-nostatic.patch +++ b/xmlstarlet-1.0.3-nostatic.patch @@ -10,7 +10,7 @@ diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac -[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"] + [: ${LIBXML_INCDIR="`xml2-config --cflags`"}]) +[LIBXML_LIBS="`xml2-config --libs`"] -+[LIBXML_CPPFLAGS="-DLIBXML_STATIC $LIBXML_INCDIR"] ++[LIBXML_CPPFLAGS="$LIBXML_INCDIR"] XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) [: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}] diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b7344d8..3e6f32d 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -32,7 +32,7 @@ commands. %build autoreconf -i -%configure --with-libxml-prefix=%{_prefix} --with-libxslt-prefix=%{_prefix} +%configure --libdir=%{_libdir} make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml From 8ad1aeac675f3c5d5398b26e94850f48374a22d4 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Wed, 19 Jan 2011 21:03:24 -0500 Subject: [PATCH 15/70] Update to 1.0.4, dropping deprecated patches --- .gitignore | 1 + sources | 2 +- xmlstarlet-1.0.3-bigxmldtd-results.patch | 5 ---- xmlstarlet-1.0.3-nostatic.patch | 28 ------------------- ...me.patch => xmlstarlet-1.0.4-cmdname.patch | 18 ------------ xmlstarlet.spec | 27 +++++++++--------- 6 files changed, 16 insertions(+), 65 deletions(-) delete mode 100644 xmlstarlet-1.0.3-bigxmldtd-results.patch delete mode 100644 xmlstarlet-1.0.3-nostatic.patch rename xmlstarlet-1.0.3-cmdname.patch => xmlstarlet-1.0.4-cmdname.patch (88%) diff --git a/.gitignore b/.gitignore index 80e915d..454a404 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xmlstarlet-1.0.1.tar.gz /xmlstarlet-1.0.2.tar.gz /xmlstarlet-1.0.3.tar.gz +/xmlstarlet-1.0.4.tar.gz diff --git a/sources b/sources index 685a30e..758c845 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec9a39540b402affcb99a07f0a03d92a xmlstarlet-1.0.3.tar.gz +dbfe7127199c0ae7f291ea11ef4f8e19 xmlstarlet-1.0.4.tar.gz diff --git a/xmlstarlet-1.0.3-bigxmldtd-results.patch b/xmlstarlet-1.0.3-bigxmldtd-results.patch deleted file mode 100644 index 1545a0f..0000000 --- a/xmlstarlet-1.0.3-bigxmldtd-results.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- xmlstarlet-1.0.3-original/examples/results/bigxml-dtd.out 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/examples/results/bigxml-dtd.out 2010-12-18 08:10:21.257959145 -0500 -@@ -1 +1 @@ ---:7000x -+-:6553x diff --git a/xmlstarlet-1.0.3-nostatic.patch b/xmlstarlet-1.0.3-nostatic.patch deleted file mode 100644 index 5a4c8d3..0000000 --- a/xmlstarlet-1.0.3-nostatic.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac ---- xmlstarlet-1.0.3-original/configure.ac 2010-11-17 14:47:55.000000000 -0500 -+++ xmlstarlet-1.0.3/configure.ac 2010-12-17 11:59:27.090514304 -0500 -@@ -29,18 +29,18 @@ - XSTAR_LIB_CHECK([LIBXML], [xml2-config]) - AS_IF([test "x$LIBXML_SRCDIR" != x], - [LIBXML_INCDIR="$LIBXML_SRCDIR/include"], -- [: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}]) --[LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"] --[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"] -+ [: ${LIBXML_INCDIR="`xml2-config --cflags`"}]) -+[LIBXML_LIBS="`xml2-config --libs`"] -+[LIBXML_CPPFLAGS="$LIBXML_INCDIR"] - - XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) - [: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}] - AS_IF([test "x$LIBXSLT_SRCDIR" != x], - [LIBXSLT_INCDIR="$LIBXSLT_SRCDIR" - LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"], -- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"]) --[: ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}] --[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"] -+ [LIBXSLT_LIBS="`xslt-config --libs` -lexslt"]) -+[: ${LIBSLT_INCDIR="`xslt-config --cflags`"}] -+[LIBXSLT_CPPFLAGS="$LIBXSLT_INCDIR"] - - [WIN32_EXTRA_LDFLAGS=] - [WIN32_EXTRA_LIBS=] diff --git a/xmlstarlet-1.0.3-cmdname.patch b/xmlstarlet-1.0.4-cmdname.patch similarity index 88% rename from xmlstarlet-1.0.3-cmdname.patch rename to xmlstarlet-1.0.4-cmdname.patch index 7382b99..54d06c8 100644 --- a/xmlstarlet-1.0.3-cmdname.patch +++ b/xmlstarlet-1.0.4-cmdname.patch @@ -1,21 +1,3 @@ -diff -uNr xmlstarlet-1.0.3-original/examples/xmlstarlet xmlstarlet-1.0.3/examples/xmlstarlet ---- xmlstarlet-1.0.3-original/examples/xmlstarlet 2010-11-10 18:42:26.000000000 -0500 -+++ xmlstarlet-1.0.3/examples/xmlstarlet 2010-12-17 12:09:15.644655135 -0500 -@@ -1,4 +1,4 @@ - #!/bin/sh - --../src/xml ${@+"$@"} -+../src/xmlstarlet ${@+"$@"} - -diff -uNr xmlstarlet-1.0.3-original/src/Makefile.am xmlstarlet-1.0.3/src/Makefile.am ---- xmlstarlet-1.0.3-original/src/Makefile.am 2010-11-16 20:43:53.000000000 -0500 -+++ xmlstarlet-1.0.3/src/Makefile.am 2010-12-17 12:08:55.760085370 -0500 -@@ -1,3 +1,3 @@ --bin_PROGRAMS = xml -+bin_PROGRAMS = xmlstarlet - --xml_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c -+xmlstarlet_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c --- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500 diff --git a/xmlstarlet.spec b/xmlstarlet.spec index 3e6f32d..b3cb4f0 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,15 +1,13 @@ Name: xmlstarlet -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT URL: http://xmlstar.sourceforge.net/ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz -Patch0: xmlstarlet-1.0.3-nostatic.patch -Patch1: xmlstarlet-1.0.3-cmdname.patch -Patch2: xmlstarlet-1.0.1-docs.patch -Patch3: xmlstarlet-1.0.3-bigxmldtd-results.patch +Patch0: xmlstarlet-1.0.4-cmdname.patch +Patch1: xmlstarlet-1.0.1-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xmlto automake autoconf libxml2-devel libxslt-devel @@ -24,15 +22,13 @@ commands. %prep %setup -q # cope with inconsistent naming -%patch0 -p1 -b .nostatic -%patch1 -p1 -b .cmdname -%patch2 -p1 -b .docs -# Refer to https://bugzilla.gnome.org/show_bug.cgi?id=325533 -%patch3 -p1 -b .bigxmldtd-results +%patch0 -p1 -b .cmdname +%patch1 -p1 -b .docs + %build autoreconf -i -%configure --libdir=%{_libdir} +%configure --disable-static-libs # --libdir=%{_libdir} make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml @@ -43,11 +39,12 @@ xmlto html-nochunks xmlstarlet-ug.xml %install rm -fr %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT +# Avoid name kludging in autotools +mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet %check -cd tests -./runTests +make check %clean @@ -62,6 +59,10 @@ rm -fr %{buildroot} %changelog +* Wed Jan 19 2011 Paul W. Frields - 1.0.4-1 +- Update to new upstream 1.0.4 +- Drop patches for fixed upstream issues + * Fri Dec 17 2010 Paul W. Frields - 1.0.3-1 - Update to new upstream 1.0.3 - Add %%check section for validation testing From c3186c7578547955f5aa478957c3520a6251bff1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:35:03 -0600 Subject: [PATCH 16/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlstarlet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b3cb4f0..b148ad1 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,6 +1,6 @@ Name: xmlstarlet Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT @@ -59,6 +59,9 @@ rm -fr %{buildroot} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jan 19 2011 Paul W. Frields - 1.0.4-1 - Update to new upstream 1.0.4 - Drop patches for fixed upstream issues From 2b48b34bd8f25c1454cb3217b9195d1bf8cb2ebd Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Thu, 17 Feb 2011 11:42:32 -0500 Subject: [PATCH 17/70] Update to 1.0.5 --- .gitignore | 1 + sources | 2 +- xmlstarlet.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 454a404..73ca8f5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmlstarlet-1.0.1.tar.gz /xmlstarlet-1.0.2.tar.gz /xmlstarlet-1.0.3.tar.gz /xmlstarlet-1.0.4.tar.gz +/xmlstarlet-1.0.5.tar.gz diff --git a/sources b/sources index 758c845..ee0b456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbfe7127199c0ae7f291ea11ef4f8e19 xmlstarlet-1.0.4.tar.gz +2a7e5333051fb0b38647cd1e94e81050 xmlstarlet-1.0.5.tar.gz diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b148ad1..63b497e 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -1,16 +1,16 @@ Name: xmlstarlet -Version: 1.0.4 -Release: 2%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Command Line XML Toolkit Group: Applications/Text License: MIT URL: http://xmlstar.sourceforge.net/ Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz -Patch0: xmlstarlet-1.0.4-cmdname.patch -Patch1: xmlstarlet-1.0.1-docs.patch +Patch0: xmlstarlet-1.0.1-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xmlto automake autoconf libxml2-devel libxslt-devel +BuildRequires: xmlto automake autoconf libxslt-devel +BuildRequires: libxml2-devel >= 2.6.23 %description XMLStarlet is a set of command line utilities which can be used @@ -21,9 +21,7 @@ commands. %prep %setup -q -# cope with inconsistent naming -%patch0 -p1 -b .cmdname -%patch1 -p1 -b .docs +%patch0 -p1 -b .docs %build @@ -59,6 +57,11 @@ rm -fr %{buildroot} %changelog +* Thu Feb 17 2011 Paul W. Frields - 1.0.5-1 +- Update to upstream 1.0.5 +- Update libxml2 requirement +- Drop unnecessary patch, naming issue fixed upstream + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 1b45c0b57ce98e6fed07826aefbdf355e11e32d7 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 26 Mar 2011 14:48:56 -0400 Subject: [PATCH 18/70] Remove obsolete patches --- xmlstarlet-1.0.1-docs.patch | 661 --------------------------------- xmlstarlet-1.0.4-cmdname.patch | 175 --------- 2 files changed, 836 deletions(-) delete mode 100644 xmlstarlet-1.0.1-docs.patch delete mode 100644 xmlstarlet-1.0.4-cmdname.patch diff --git a/xmlstarlet-1.0.1-docs.patch b/xmlstarlet-1.0.1-docs.patch deleted file mode 100644 index 7b87fa9..0000000 --- a/xmlstarlet-1.0.1-docs.patch +++ /dev/null @@ -1,661 +0,0 @@ -diff -uNr xmlstarlet-1.0.1-original/doc/gen-doc xmlstarlet-1.0.1/doc/gen-doc ---- xmlstarlet-1.0.1-original/doc/gen-doc 2003-06-11 21:55:14.000000000 -0400 -+++ xmlstarlet-1.0.1/doc/gen-doc 2005-11-22 18:20:09.000000000 -0500 -@@ -14,8 +14,8 @@ - echo "1. BASIC COMMAND LINE OPTIONS" - echo "====================================================" - echo "" --echo "xml" --../src/xml 2>&1 -+echo "xmlstarlet" -+../src/xmlstarlet 2>&1 - - echo "" - echo "" -@@ -23,8 +23,8 @@ - echo "2. Select/Query XML documents" - echo "====================================================" - echo "" --echo "xml sel --help" --../src/xml sel --help 2>&1 -+echo "xmlstarlet sel --help" -+../src/xmlstarlet sel --help 2>&1 - - echo "" - echo "" -@@ -32,8 +32,8 @@ - echo "3. Editing XML documents" - echo "====================================================" - echo "" --echo "xml ed --help" --../src/xml ed --help 2>&1 -+echo "xmlstarlet ed --help" -+../src/xmlstarlet ed --help 2>&1 - - echo "" - echo "" -@@ -41,8 +41,8 @@ - echo "4. Using XSLT to transform XML documents" - echo "====================================================" - echo "" --echo "xml tr --help" --../src/xml tr --help 2>&1 -+echo "xmlstarlet tr --help" -+../src/xmlstarlet tr --help 2>&1 - - echo "" - echo "" -@@ -50,8 +50,8 @@ - echo "5. Formatting XML documents" - echo "====================================================" - echo "" --echo "xml fo --help" --../src/xml fo --help 2>&1 -+echo "xmlstarlet fo --help" -+../src/xmlstarlet fo --help 2>&1 - - echo "" - echo "" -@@ -59,8 +59,8 @@ - echo "6. Validating XML documents" - echo "====================================================" - echo "" --echo "xml val --help" --../src/xml val --help 2>&1 -+echo "xmlstarlet val --help" -+../src/xmlstarlet val --help 2>&1 - - echo "" - echo "" -@@ -68,8 +68,8 @@ - echo "7. Displaying structure of XML documents" - echo "====================================================" - echo "" --echo "xml el --help" --../src/xml el --help 2>&1 -+echo "xmlstarlet el --help" -+../src/xmlstarlet el --help 2>&1 - - echo "" - echo "" -@@ -78,8 +78,8 @@ - echo "8. Escape/Unescape special XML characters" - echo "====================================================" - echo "" --echo "xml esc --help" --../src/xml esc --help 2>&1 -+echo "xmlstarlet esc --help" -+../src/xmlstarlet esc --help 2>&1 - - echo "" - echo "" -@@ -88,8 +88,8 @@ - echo "9. List directory as XML" - echo "====================================================" - echo "" --echo "xml ls --help" --../src/xml ls --help 2>&1 -+echo "xmlstarlet ls --help" -+../src/xmlstarlet ls --help 2>&1 - - echo "" - echo "" -@@ -98,8 +98,8 @@ - echo "10. XML canonicalization" - echo "====================================================" - echo "" --echo "xml c14n --help" --../src/xml c14n --help 2>&1 -+echo "xmlstarlet c14n --help" -+../src/xmlstarlet c14n --help 2>&1 - - echo "" - echo "" -@@ -108,8 +108,8 @@ - echo "11. Convert XML into PYX format (based on ESIS - ISO 8879)" - echo "====================================================" - echo "" --echo "xml pyx --help" --../src/xml pyx --help 2>&1 -+echo "xmlstarlet pyx --help" -+../src/xmlstarlet pyx --help 2>&1 - - echo "" - echo "" -@@ -178,6 +178,6 @@ - done - - echo "" --} | sed -e "s#./xmlstarlet#xml#g" -+} - - -diff -uNr xmlstarlet-1.0.1-original/doc/xmlstarlet-man.xml xmlstarlet-1.0.1/doc/xmlstarlet-man.xml ---- xmlstarlet-1.0.1-original/doc/xmlstarlet-man.xml 2004-02-21 17:20:42.000000000 -0500 -+++ xmlstarlet-1.0.1/doc/xmlstarlet-man.xml 2005-11-22 18:17:38.000000000 -0500 -@@ -84,7 +84,7 @@ - - Commands - -- Type: xml <command> --help <ENTER> for command -+ Type: xmlstarlet <command> --help <ENTER> for command - help - - Available commands include: -diff -uNr xmlstarlet-1.0.1-original/doc/xmlstarlet-ug.xml xmlstarlet-1.0.1/doc/xmlstarlet-ug.xml ---- xmlstarlet-1.0.1-original/doc/xmlstarlet-ug.xml 2005-01-07 00:11:39.000000000 -0500 -+++ xmlstarlet-1.0.1/doc/xmlstarlet-ug.xml 2005-11-22 18:16:11.000000000 -0500 -@@ -1,6 +1,8 @@ - - -+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -+ -+]> - - XmlStarlet Command Line XML Toolkit User's Guide - -@@ -298,7 +300,7 @@ - - Basic command line syntax: bash-2.03$ xml - XMLStarlet Toolkit: Command line utilities for XML --Usage: xml [<options>] <command> [<cmd-options>] -+Usage: &XMLSTARLET; [<options>] <command> [<cmd-options>] - where <command> is one of: - ed (or edit) - Edit/Update XML document(s) - sel (or select) - Select data or query XML document(s) (XPATH, etc) -@@ -318,7 +320,7 @@ - Wherever file name mentioned in command help it is assumed - that URL can be used instead as well. - --Type: xml <command> --help <ENTER> for command help -+Type: &XMLSTARLET; <command> --help <ENTER> for command help - - XMLStarlet is a command line toolkit to query/edit/check/transform - XML documents (for more information see http://xmlstar.sourceforge.net/) -@@ -350,7 +352,7 @@ - </table> - </xml> - -- xml el table.xml -+ &XMLSTARLET; el table.xml - - would produce the following output. - -@@ -379,7 +381,7 @@ - - EXAMPLE: - -- xml el -u table.xml -+ &XMLSTARLET; el -u table.xml - - Output: - -@@ -396,7 +398,7 @@ - - EXAMPLE: - -- xml el -a table.xml -+ &XMLSTARLET; el -a table.xml - - Output: - -@@ -421,7 +423,7 @@ - - EXAMPLE: - -- xml el -v table.xml -+ &XMLSTARLET; el -v table.xml - - Output: - -@@ -448,10 +450,10 @@ - Querying XML documents - - XmlStarlet 'select' or 'sel' option can be used to query or search -- XML documents. Here is synopsis for 'xml sel' command: -+ XML documents. Here is synopsis for '&XMLSTARLET; sel' command: - - XMLStarlet Toolkit: Select from XML document(s) --Usage: xml sel <global-options> {<template>} [ <xml-file> ... ] -+Usage: &XMLSTARLET; sel <global-options> {<template>} [ <xml-file> ... ] - where - <global-options> - global options for selecting - <xml-file> - input XML document file name/uri (stdin is used if missing) -@@ -495,7 +497,7 @@ - in a single template. The effect of applying command line templates - can be illustrated with the following XSLT analogue - --xml sel -t -c "xpath0" -m "xpath1" -m "xpath2" -v "xpath3" \ -+&XMLSTARLET; sel -t -c "xpath0" -m "xpath1" -m "xpath2" -v "xpath3" \ - -t -m "xpath4" -c "xpath5" - - is equivalent to applying the following XSLT -@@ -549,7 +551,7 @@ - - - -- xml sel -t -v "count(/xml/table/rec/numField)" table.xml -+ &XMLSTARLET; sel -t -v "count(/xml/table/rec/numField)" table.xml - - Input (table.xml): - -@@ -578,7 +580,7 @@ - Let's take a close look what it did internally. For that we will - use '-C' option - -- $ xml sel -C -t -v "count(/xml/table/rec/numField)" -+ $ &XMLSTARLET; sel -C -t -v "count(/xml/table/rec/numField)" - <?xml version="1.0"?> - <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:exslt="http://exslt.org/common" -@@ -668,7 +670,7 @@ - Count all nodes in XML documents. Print input name and node count - after it. - -- xml sel -t -f -o " " -v "count(//node())" xml/table.xml xml/tab-obj.xml -+ &XMLSTARLET; sel -t -f -o " " -v "count(//node())" xml/table.xml xml/tab-obj.xml - - Output: - -@@ -682,7 +684,7 @@ - Find XML files matching XPath expression (containing 'object' - element) - -- xml sel -t -m //object -f xml/table.xml xml/tab-obj.xml -+ &XMLSTARLET; sel -t -m //object -f xml/table.xml xml/tab-obj.xml - - Result output: - -@@ -694,7 +696,7 @@ - - Calculate EXSLT (XSLT extentions) XPath value - -- echo "<x/>" | xml sel -t -v "math:abs(-1000)" -+ echo "<x/>" | &XMLSTARLET; sel -t -v "math:abs(-1000)" - - Result output: - -@@ -704,9 +706,9 @@ - - EXAMPLE - -- Adding elements and attributes using command line 'xml sel' -+ Adding elements and attributes using command line '&XMLSTARLET; sel' - -- echo "<x/>" | xml sel -t -m / -e xml -e child -a data -o value -+ echo "<x/>" | &XMLSTARLET; sel -t -m / -e xml -e child -a data -o value - - Result Output: - -@@ -718,7 +720,7 @@ - - Query XML document and produce sorted text table - -- xml sel -T -t -m /xml/table/rec -s D:N:- "@id" \ -+ &XMLSTARLET; sel -T -t -m /xml/table/rec -s D:N:- "@id" \ - -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml - - Result Output: -@@ -751,7 +753,7 @@ - - Predefine namespaces for XPath expressions - -- xml sel -N xsql=urn:oracle-xsql -t -v /xsql:query xsql/jobserve.xsql -+ &XMLSTARLET; sel -N xsql=urn:oracle-xsql -t -v /xsql:query xsql/jobserve.xsql - - Input (xsql/jobserve.xsql) - -@@ -777,10 +779,10 @@ - - EXAMPLE - -- Print structure of XML element using xml sel (advanced XPath -- expressions and xml sel command usage) -+ Print structure of XML element using &XMLSTARLET; sel (advanced XPath -+ expressions and &XMLSTARLET; sel command usage) - -- xml sel -T -t -m '//*' \ -+ &XMLSTARLET; sel -T -t -m '//*' \ - -m 'ancestor-or-self::*' -v 'name()' -i 'not(position()=last())' -o . -b -b -n \ - xml/structure.xml - -@@ -843,7 +845,7 @@ - - Print all links of xhtml document - -- xml sel --net --html -T -t -m "//*[local-name()='a']" \ -+ &XMLSTARLET; sel --net --html -T -t -m "//*[local-name()='a']" \ - -o 'NAME: ' -v "translate(. , '&#10;', ' ')" -n \ - -o 'LINK: ' -v @href -n -n \ - http://xmlstar.sourceforge.net/ -@@ -872,10 +874,10 @@ - - Transforming XML documents - -- Here is synopsis for 'xml tr' command: -+ Here is synopsis for '&XMLSTARLET; tr' command: - - XMLStarlet Toolkit: Transform XML document(s) using XSLT --Usage: xml tr [<options>] <xsl-file> {-p|-s <name>=<value>} [ <xml-file-or-uri> ... ] -+Usage: &XMLSTARLET; tr [<options>] <xsl-file> {-p|-s <name>=<value>} [ <xml-file-or-uri> ... ] - where - <xsl-file> - main XSLT stylesheet for transformation - <xml-file> - input XML document file name (stdin is used if missing) -@@ -904,7 +906,7 @@ - EXAMPLE: - - # Transform passing parameters to XSLT stylesheet --xml tr xsl/param1.xsl -p Count='count(/xml/table/rec)' -s Text="Count=" xml/table.xml -+&XMLSTARLET; tr xsl/param1.xsl -p Count='count(/xml/table/rec)' -s Text="Count=" xml/table.xml - - - Input xsl/params1.xsl -@@ -934,10 +936,10 @@ - - Editing XML documents - -- Here is the synopsis for 'xml ed' command: -+ Here is the synopsis for '&XMLSTARLET; ed' command: - - XMLStarlet Toolkit: Edit XML document(s) --Usage: xml ed <global-options> {<action>} [ <xml-file-or-uri> ... ] -+Usage: &XMLSTARLET; ed <global-options> {<action>} [ <xml-file-or-uri> ... ] - where - <global-options> - global options for editing - <xml-file-or-uri> - input XML document file name/uri (stdin is used if missing) -@@ -969,7 +971,7 @@ - EXAMPLE: - - # Delete elements matching XPath expression --xml ed -d "/xml/table/rec[@id='2']" xml/table.xml -+&XMLSTARLET; ed -d "/xml/table/rec[@id='2']" xml/table.xml - - - Input -@@ -1011,7 +1013,7 @@ - EXAMPLE - - # Move element node --echo '<x id="1"><a/><b/></x>' | xml ed -m "//b" "//a" -+echo '<x id="1"><a/><b/></x>' | &XMLSTARLET; ed -m "//b" "//a" - - - Output -@@ -1026,7 +1028,7 @@ - EXAMPLE - - # Rename attributes --xml ed -r "//*/@id" -v ID xml/tab-obj.xml -+&XMLSTARLET; ed -r "//*/@id" -v ID xml/tab-obj.xml - - - Output: -@@ -1056,7 +1058,7 @@ - EXAMPLE - - # Rename elements --xml ed -r "/xml/table/rec" -v record xml/tab-obj.xml -+&XMLSTARLET; ed -r "/xml/table/rec" -v record xml/tab-obj.xml - - - Output: -@@ -1086,7 +1088,7 @@ - EXAMPLE - - # Update value of an attribute --xml ed -u "/xml/table/rec[@id=3]/@id" -v 5 xml/tab-obj.xml -+&XMLSTARLET; ed -u "/xml/table/rec[@id=3]/@id" -v 5 xml/tab-obj.xml - - - Output: -@@ -1116,7 +1118,7 @@ - EXAMPLE - - # Update value of an element --xml ed -u "/xml/table/rec[@id=1]/numField" -v 0 xml/tab-obj.xml -+&XMLSTARLET; ed -u "/xml/table/rec[@id=1]/numField" -v 0 xml/tab-obj.xml - - - Output: -@@ -1147,10 +1149,10 @@ - - Validating XML documents - -- Here is synopsis for 'xml val' command: -+ Here is synopsis for '&XMLSTARLET; val' command: - - XMLStarlet Toolkit: Validate XML document(s) --Usage: xml val <options> [ <xml-file-or-uri> ... ] -+Usage: &XMLSTARLET; val <options> [ <xml-file-or-uri> ... ] - where <options> - -w or --well-formed - validate well-formedness only (default) - -d or --dtd <dtd-file> - validate against DTD -@@ -1171,7 +1173,7 @@ - EXAMPLE - - # Validate XML document against DTD --xml val --dtd dtd/table.dtd xml/tab-obj.xml >/dev/null 2>&1; echo $? -+&XMLSTARLET; val --dtd dtd/table.dtd xml/tab-obj.xml >/dev/null 2>&1; echo $? - - - Output: -@@ -1182,7 +1184,7 @@ - EXAMPLE - - # Validate against XSD schema --xml val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $? -+&XMLSTARLET; val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $? - - - Output: -@@ -1195,10 +1197,10 @@ - - Formatting XML documents - -- Here is synopsis for 'xml fo' command: -+ Here is synopsis for '&XMLSTARLET; fo' command: - - XMLStarlet Toolkit: Format XML document --Usage: xml fo [<options>] <xml-file> -+Usage: &XMLSTARLET; fo [<options>] <xml-file> - where <options> are - -n or --noindent - do not indent - -t or --indent-tab - indent output with tabulation -@@ -1219,7 +1221,7 @@ - EXAMPLE - - # Format XML document disabling indent --cat xml/tab-obj.xml | xml fo --noindent -+cat xml/tab-obj.xml | &XMLSTARLET; fo --noindent - - - Output: -@@ -1249,7 +1251,7 @@ - EXAMPLE - - # Recover malformed XML document --xml fo -R xml/malformed.xml 2>/dev/null -+&XMLSTARLET; fo -R xml/malformed.xml 2>/dev/null - - - Input: -@@ -1272,10 +1274,10 @@ - - Canonicalization of XML documents - -- Here is synopsis for 'xml c14n' command: -+ Here is synopsis for '&XMLSTARLET; c14n' command: - - XMLStarlet Toolkit: XML canonicalization --Usage: xml c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>] -+Usage: &XMLSTARLET; c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>] - where - <xml-file> - input XML document file name (stdin is used if '-') - <xpath-file> - XML file containing XPath expression for -@@ -1303,7 +1305,7 @@ - EXAMPLE - - # XML canonicalization --xml c14n --with-comments ../examples/xml/structure.xml ; echo $? -+&XMLSTARLET; c14n --with-comments ../examples/xml/structure.xml ; echo $? - - - Input ../examples/xml/structure.xml -@@ -1345,7 +1347,7 @@ - EXAMPLE - - # XML exclusive canonicalization --xml c14n --exc-with-comments ../examples/xml/c14n.xml ../examples/xml/c14n.xpath -+&XMLSTARLET; c14n --exc-with-comments ../examples/xml/c14n.xml ../examples/xml/c14n.xpath - - - Input -@@ -1377,10 +1379,10 @@ - - XML and PYX format - -- Here is synopsis for 'xml pyx' command: -+ Here is synopsis for '&XMLSTARLET; pyx' command: - - XMLStarlet Toolkit: Convert XML into PYX format (based on ESIS - ISO 8879) --Usage: xml pyx {<xml-file>} -+Usage: &XMLSTARLET; pyx {<xml-file>} - where - <xml-file> - input XML document file name (stdin is used if missing) - -@@ -1399,7 +1401,7 @@ - - EXAMPLE - -- xml pyx input.xml -+ &XMLSTARLET; pyx input.xml - - - Input (input.xml) -@@ -1446,7 +1448,7 @@ - EXAMPLE (Delete all attributes). This should work really fast for - very large XML documents. - -- xml pyx input.xml | grep -v "^A" | xml depyx -+ &XMLSTARLET; pyx input.xml | grep -v "^A" | &XMLSTARLET; depyx - - Output - -@@ -1466,11 +1468,11 @@ - - Escape/Unescape special XML characters - -- Here is synopsis for 'xml esc' command: -+ Here is synopsis for '&XMLSTARLET; esc' command: - -- xml esc --help -+ &XMLSTARLET; esc --help - XMLStarlet Toolkit: Escape special XML characters --Usage: xml esc [<options>] [<string>] -+Usage: &XMLSTARLET; esc [<options>] [<string>] - where <options> are - --help - print usage - (TODO: more to be added in future) -@@ -1483,7 +1485,7 @@ - EXAMPLE - - # Escape special XML characters --cat xml/structure.xml | xml esc -+cat xml/structure.xml | &XMLSTARLET; esc - - - Input -@@ -1525,10 +1527,10 @@ - - List directory as XML - -- Here is synopsis for 'xml ls' command: -+ Here is synopsis for '&XMLSTARLET; ls' command: - - XMLStarlet Toolkit: List directory as XML --Usage: xml ls -+Usage: &XMLSTARLET; ls - Lists current directory in XML format. - - XMLStarlet is a command line toolkit to query/edit/check/transform -@@ -1537,7 +1539,7 @@ - - EXAMPLE - -- xml ls -+ &XMLSTARLET; ls - - - Output -@@ -1583,7 +1585,7 @@ - And the following (initially looking correct) query to print all - links - -- xml sel -t -m "//a" -c . -n -+ &XMLSTARLET; sel -t -m "//a" -c . -n - - would return nothing. The issue with this query is that it is not - addressing element <a> in the right namespace. XPath requires all -@@ -1593,7 +1595,7 @@ - detail: namespace equivalency is determined not by namespace prefix, but - by URI. See query below, which would return expected result - -- xml sel -N x="http://www.w3.org/1999/xhtml" -t -m "//x:a" -c . -n -+ &XMLSTARLET; sel -N x="http://www.w3.org/1999/xhtml" -t -m "//x:a" -c . -n - - Example of deleting namespace declarations. - -@@ -1608,7 +1610,7 @@ - </doc> - - -- Command:xml ed -N N="http://www.c.com/xyz" -d '//N:*' ns2.xml | \ -+ Command:&XMLSTARLET; ed -N N="http://www.c.com/xyz" -d '//N:*' ns2.xml | \ - sed -e 's/ xmlns.*=".*"//g' - - Output<doc> -@@ -1629,29 +1631,29 @@ - executed by shell and shell does substitutions of its special characters - too. So for example, one may ask: - -- "Why does the following query return nothing?"echo '<X name="foo">EEE</X>' | xml sel -t -m /X[@name='foo'] -v . -+ "Why does the following query return nothing?"echo '<X name="foo">EEE</X>' | &XMLSTARLET; sel -t -m /X[@name='foo'] -v . - - The answer lies in the way shell substitues 'foo', which simply - becomes foo before the command is run. So the correct way to write that - would be - -- echo '<X name="foo">EEE</X>' | xml sel -t -m "/X[@name='foo']" -v . -+ echo '<X name="foo">EEE</X>' | &XMLSTARLET; sel -t -m "/X[@name='foo']" -v . - - Another example involves XML special characters. Question: How to - search for &apos; in text nodes? - -- The following should helpxml sel -t -m "//line[contains(text(),&quot;'&quot;)]" -c . -+ The following should help&XMLSTARLET; sel -t -m "//line[contains(text(),&quot;'&quot;)]" -c . - - - - - Sorting - -- Let's take a look at XSLT produced by the following 'xml sel' -+ Let's take a look at XSLT produced by the following '&XMLSTARLET; sel' - command: - - # Query XML document and produce sorted text table --xml sel -T -t -m /xml/table/rec -s D:N:- "@id" \ -+&XMLSTARLET; sel -T -t -m /xml/table/rec -s D:N:- "@id" \ - -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml - - -@@ -1672,7 +1674,7 @@ - </xsl:stylesheet> - - -- -s option of 'xml sel' command controls 'order', 'data-type', and -+ -s option of '&XMLSTARLET; sel' command controls 'order', 'data-type', and - 'case-order' attributes of <xsl:sort/> element . - - diff --git a/xmlstarlet-1.0.4-cmdname.patch b/xmlstarlet-1.0.4-cmdname.patch deleted file mode 100644 index 54d06c8..0000000 --- a/xmlstarlet-1.0.4-cmdname.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c ---- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500 -@@ -49,7 +49,7 @@ - */ - static const char usage_str_1[] = - "XMLStarlet Toolkit: Command line utilities for XML\n" --"Usage: xml [] []\n"; -+"Usage: xmlstarlet [] []\n"; - - static const char usage_str_2[] = - "where is one of:\n" -@@ -74,7 +74,7 @@ - " --help - show help\n" - "Wherever file name mentioned in command help it is assumed\n" - "that URL can be used instead as well.\n\n" --"Type: xml --help for command help\n\n"; -+"Type: xmlstarlet --help for command help\n\n"; - - - -diff -uNr xmlstarlet-1.0.3-original/src/xml_C14N.c xmlstarlet-1.0.3/src/xml_C14N.c ---- xmlstarlet-1.0.3-original/src/xml_C14N.c 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_C14N.c 2010-12-17 12:08:55.761085249 -0500 -@@ -34,7 +34,7 @@ - - static const char c14n_usage_str_1[] = - "XMLStarlet Toolkit: XML canonicalization\n" --"Usage: xml c14n [] []\n" -+"Usage: xmlstarlet c14n [] []\n" - "where\n" - " - input XML document file name (stdin is used if '-')\n" - " - XML file containing XPath expression for\n" -diff -uNr xmlstarlet-1.0.3-original/src/xml_depyx.c xmlstarlet-1.0.3/src/xml_depyx.c ---- xmlstarlet-1.0.3-original/src/xml_depyx.c 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_depyx.c 2010-12-17 12:08:55.762085127 -0500 -@@ -38,7 +38,7 @@ - - static const char depyx_usage_str[] = - "XMLStarlet Toolkit: Convert PYX into XML\n" --"Usage: xml p2x []\n" -+"Usage: xmlstarlet p2x []\n" - "where\n" - " - input PYX document file name (stdin is used if missing)\n\n" - "The PYX format is a line-oriented representation of\n" -diff -uNr xmlstarlet-1.0.3-original/src/xml_edit.c xmlstarlet-1.0.3/src/xml_edit.c ---- xmlstarlet-1.0.3-original/src/xml_edit.c 2010-11-14 11:18:43.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_edit.c 2010-12-17 12:08:55.762085127 -0500 -@@ -109,7 +109,7 @@ - */ - static const char edit_usage_str_1[] = - "XMLStarlet Toolkit: Edit XML document(s)\n" --"Usage: xml ed {} [ ... ]\n" -+"Usage: xmlstarlet ed {} [ ... ]\n" - "where\n" - " - global options for editing\n" - " - input XML document file name/uri (stdin otherwise)\n\n"; -diff -uNr xmlstarlet-1.0.3-original/src/xml_elem.c xmlstarlet-1.0.3/src/xml_elem.c ---- xmlstarlet-1.0.3-original/src/xml_elem.c 2010-11-10 18:42:26.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_elem.c 2010-12-17 12:08:55.763085005 -0500 -@@ -67,7 +67,7 @@ - - static const char elem_usage_str[] = - "XMLStarlet Toolkit: Display element structure of XML document\n" --"Usage: xml el [] \n" -+"Usage: xmlstarlet el [] \n" - "where\n" - " - input XML document file name (stdin is used if missing)\n" - " is one of:\n" -diff -uNr xmlstarlet-1.0.3-original/src/xml_escape.c xmlstarlet-1.0.3/src/xml_escape.c ---- xmlstarlet-1.0.3-original/src/xml_escape.c 2010-11-10 18:42:26.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_escape.c 2010-12-17 12:08:55.763085005 -0500 -@@ -52,7 +52,7 @@ - - static const char escape_usage_str[] = - "XMLStarlet Toolkit: %s special XML characters\n" --"Usage: xml %s [] []\n" -+"Usage: xmlstarlet %s [] []\n" - "where are\n" - " --help - print usage\n" - " (TODO: more to be added in future)\n" -diff -uNr xmlstarlet-1.0.3-original/src/xml_format.c xmlstarlet-1.0.3/src/xml_format.c ---- xmlstarlet-1.0.3-original/src/xml_format.c 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_format.c 2010-12-17 12:08:55.764084881 -0500 -@@ -73,7 +73,7 @@ - */ - static const char format_usage_str_1[] = - "XMLStarlet Toolkit: Format XML document\n" --"Usage: xml fo [] \n" -+"Usage: xmlstarlet fo [] \n" - "where are\n" - " -n or --noindent - do not indent\n" - " -t or --indent-tab - indent output with tabulation\n" -diff -uNr xmlstarlet-1.0.3-original/src/xml_ls.c xmlstarlet-1.0.3/src/xml_ls.c ---- xmlstarlet-1.0.3-original/src/xml_ls.c 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_ls.c 2010-12-17 12:08:55.764084881 -0500 -@@ -44,7 +44,7 @@ - - static const char ls_usage_str[] = - "XMLStarlet Toolkit: List directory as XML\n" --"Usage: xml ls\n" -+"Usage: xmlstarlet ls\n" - "Lists current directory in XML format.\n" - "Time is shown per ISO 8601 spec.\n" - "\n"; -diff -uNr xmlstarlet-1.0.3-original/src/xml_pyx.c xmlstarlet-1.0.3/src/xml_pyx.c ---- xmlstarlet-1.0.3-original/src/xml_pyx.c 2010-11-14 10:47:45.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_pyx.c 2010-12-17 12:08:55.765084757 -0500 -@@ -23,7 +23,7 @@ - */ - static const char pyx_usage_str_1[] = - "XMLStarlet Toolkit: Convert XML into PYX format (based on ESIS - ISO 8879)\n" --"Usage: xml pyx {}\n" -+"Usage: xmlstarlet pyx {}\n" - "where\n" - " - input XML document file name (stdin is used if missing)\n\n"; - -diff -uNr xmlstarlet-1.0.3-original/src/xml_select.c xmlstarlet-1.0.3/src/xml_select.c ---- xmlstarlet-1.0.3-original/src/xml_select.c 2010-11-13 11:56:13.000000000 -0500 -+++ xmlstarlet-1.0.3/src/xml_select.c 2010-12-17 12:08:55.765084757 -0500 -@@ -65,7 +65,7 @@ - */ - static const char select_usage_str_1[] = - "XMLStarlet Toolkit: Select from XML document(s)\n" --"Usage: xml sel {