- updated to 1.2.1auto/ti/xmlstarlet-1_2_1-1auto/th/xmlstarlet-1_2_1-1auto/ac/xmlstarlet-1_2_1-1

- removed nostatic patch
- added xmlstarlet link for binary

Changed files:
    xmlstarlet-nostatic.patch -> 1.2
    xmlstarlet.spec -> 1.6

2 files changed, 15 insertions, 80 deletions

diff --git a/xmlstarlet-nostatic.patch b/xmlstarlet-nostatic.patch
deleted file mode 100644
index 8f8d3bf..0000000
--- a/xmlstarlet-nostatic.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- xmlstarlet-1.0.1/configure.in.orig	2007-03-04 01:52:01.658866250 +0100
-+++ xmlstarlet-1.0.1/configure.in	2007-03-04 01:52:42.069391750 +0100
-@@ -31,7 +31,7 @@
-         [  --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 -lpthread -ldl"
- )
-         
- AC_ARG_WITH(libxml-include-prefix,
-@@ -41,13 +41,13 @@
- 
- 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 -lpthread -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 -lpthread"
-         LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include"
- )
- 
-@@ -74,7 +74,7 @@
-         [  --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 -lexslt -lz -lm -lpthread"
- )
-         
- AC_ARG_WITH(libxslt-include-prefix,
-@@ -84,13 +84,13 @@
- 
- 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 -lexslt -lz -lm -lpthread"
- )
- 
- 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 -lexslt -lz -lm -lpthread"
-         LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval"
- )
- 
-@@ -236,7 +236,7 @@
- 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 -lpthread -ldl"
- fi
- 
- dnl
-@@ -252,7 +252,7 @@
- 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 -lexslt -lz -lm -lpthread"
- fi
- 
- dnl
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index c9ca1f3..91b6ce3 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -1,18 +1,19 @@
 Summary:	Command Line XML Toolkit
 Summary(pl.UTF-8):	Zestaw obsługiwanych z linii poleceń narzędzi do XML-a
 Name:		xmlstarlet
-Version:	1.0.1
+Version:	1.2.1
 Release:	1
 License:	MIT
 Group:		Applications/Publishing/XML
-Source0:	http://xmlstar.sourceforge.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	8deb71834bcdfb4443c258a1f0042fce
-Patch0:		%{name}-nostatic.patch
+Source0:	http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz
+# Source0-md5:	575d2b0fc97450c97f4029817a8a787a
 URL:		http://xmlstar.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	libxml2-devel >= 1:2.6.12
+BuildRequires:	autoconf >= 2.62
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	libxml2-devel >= 1:2.6.23
 BuildRequires:	libxslt-devel >= 1.1.9
+Requires:	libxml2 >= 1:2.6.23
+Requires:	libxslt >= 1.1.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,14 +31,14 @@ przy użyciu poleceń uniksowych grep, sed, awk, diff, patch, join itp.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -46,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# rename to what is expected, keep "xml" name for compatibility
+ln $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,4 +57,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet.pdf
 %attr(755,root,root) %{_bindir}/xml
+%attr(755,root,root) %{_bindir}/xmlstarlet
 %{_mandir}/man1/xmlstarlet.1*