From 2b48b34bd8f25c1454cb3217b9195d1bf8cb2ebd Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Thu, 17 Feb 2011 11:42:32 -0500
Subject: [PATCH] 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 <stickster@gmail.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild