From 217212a875f3ca0938ddd2bf5f0d9949afd98cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Sat, 5 Apr 2014 15:22:58 +0200
Subject: [PATCH] New version 0.0.26

---
 .gitignore               |  1 +
 sources                  |  2 +-
 xmlto-noextensions.patch | 12 ------------
 xmlto.spec               | 19 +++++++++----------
 4 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 xmlto-noextensions.patch

diff --git a/.gitignore b/.gitignore
index 2193965..a2d4cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xmlto-0.0.23.tar.bz2
 /xmlto-0.0.24.tar.bz2
 /xmlto-0.0.25.tar.bz2
+/xmlto-0.0.26.tar.bz2
diff --git a/sources b/sources
index 03a9d63..b19abb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b6267b1470f8571fe5f63a128970364  xmlto-0.0.25.tar.bz2
+c90a47c774e0963581c1ba57235f64f4  xmlto-0.0.26.tar.bz2
diff --git a/xmlto-noextensions.patch b/xmlto-noextensions.patch
deleted file mode 100644
index 1ff2415..0000000
--- a/xmlto-noextensions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp xmlto-0.0.25-orig/xmlto.in xmlto-0.0.25/xmlto.in
---- xmlto-0.0.25-orig/xmlto.in	2011-11-29 12:49:57.000000000 +0100
-+++ xmlto-0.0.25/xmlto.in	2012-06-08 20:30:11.492008539 +0200
-@@ -262,7 +262,7 @@ ZIP_PATH=@ZIP@
- 
- # Process any options
- ARGS=$(${GETOPT} \
--	--longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \
-+	--longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \
- 	-n xmlto -- x:m:o:p:v "$@")
- [ $? != 0 ] && { usage; exit 1; }
- eval set -- "$ARGS"
diff --git a/xmlto.spec b/xmlto.spec
index 0c53dca..b6bd858 100644
--- a/xmlto.spec
+++ b/xmlto.spec
@@ -1,7 +1,7 @@
 Summary: A tool for converting XML files to various formats
 Name: xmlto
-Version: 0.0.25
-Release: 7%{?dist}
+Version: 0.0.26
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 #Older versions up to xmlto-0.0.20
@@ -9,16 +9,14 @@ Group: Applications/System
 #Source0: http://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2
 URL: https://fedorahosted.org/xmlto/
 Source0: https://fedorahosted.org/releases/x/m/%{name}/%{name}-%{version}.tar.bz2
-Patch1: xmlto-noextensions.patch
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: docbook-xsl >= 1.56.0
+BuildRequires: docbook-xsl
 BuildRequires: libxslt
 BuildRequires: util-linux, flex
 
 # We rely heavily on the DocBook XSL stylesheets!
-Requires: docbook-xsl >= 1.74.2
+Requires: docbook-xsl
 Requires: libxslt
 Requires: docbook-dtds
 Requires: util-linux, flex
@@ -58,7 +56,6 @@ xhtml1 source format.
 
 %prep
 %setup -q
-%patch1 -p1 -b .noextension
 
 %build
 %configure BASH=/bin/bash
@@ -71,9 +68,6 @@ make check
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README AUTHORS NEWS
@@ -100,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 04 2014 Ondrej Vasik <ovasik@redhat.com> - 0.0.26-1
+- New version 0.0.26
+- fix build with automake 1.13+
+- fix warning in searchpath option
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.25-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild