[xmlstarlet] Update to 1.0.4, dropping deprecated patches

[Paul W. Frields]

commit 8ad1aeac675f3c5d5398b26e94850f48374a22d4
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Jan 19 21:03:24 2011 -0500

    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 --------------------
 ...cmdname.patch => xmlstarlet-1.0.4-cmdname.patch |   18 ------------
 xmlstarlet.spec                                    |   27 ++++++++++---------
 6 files changed, 16 insertions(+), 65 deletions(-)
---
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-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 <stickster at gmail.com> - 1.0.4-1
+- Update to new upstream 1.0.4
+- Drop patches for fixed upstream issues
+
 * Fri Dec 17 2010 Paul W. Frields <stickster at gmail.com> - 1.0.3-1
 - Update to new upstream 1.0.3
 - Add %%check section for validation testing