From f2be6df9aff85a24af9e3b5f3cde76d36444d62546d26a34bbd0ec8755f2ca69 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Wed, 5 Dec 2012 23:20:50 +0000
Subject: [PATCH 1/2] add explicit requires for libxslt-tools or libxslt1 in
 order to fix "have choice" in several repos

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=21
---
 xmlto.changes |  6 ++++++
 xmlto.spec    | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/xmlto.changes b/xmlto.changes
index 2590864..7d52aaa 100644
--- a/xmlto.changes
+++ b/xmlto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec  5 23:17:29 UTC 2012 - pascal.bleser@opensuse.org
+
+- add explicit requires for libxslt-tools or libxslt1 in order to
+  fix "have choice" in several repos
+
 -------------------------------------------------------------------
 Wed Apr 18 16:47:31 UTC 2012 - chris@computersalat.de
 
diff --git a/xmlto.spec b/xmlto.spec
index 484b83c..86a8de5 100644
--- a/xmlto.spec
+++ b/xmlto.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?suse_version} < 1030
 %define dist_has_fdupes 0
 %else
@@ -53,7 +54,17 @@ BuildRequires:  fdupes
 # We rely entirely on the DocBook XSL stylesheets!
 Requires:       docbook-xsl-stylesheets >= 1.56.0
 Requires:       docbook_4
+%if 0%{?suse_version} > 1210
+Requires:       libxslt-tools
+BuildRequires:  libxslt-tools
+%endif
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1220
+Requires:       libxslt1
+BuildRequires:  libxslt1
+%endif
+%if 0%{?suse_version} < 1
 Requires:       xsltproc
+%endif
 # For full functionality, we need passivetex.
 Recommends:     texlive-xmltex >= 2007
 

From ef9953b2e7eb66e792279ba905099bed182425c3b017fa5fbdd58757df6fb895 Mon Sep 17 00:00:00 2001
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Thu, 6 Dec 2012 07:29:12 +0000
Subject: [PATCH 2/2] - fixed xsltproc buildrequires and requires for other
 versions - more consistent spec file

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlto?expand=0&rev=22
---
 xmlto.changes |  6 ++++++
 xmlto.spec    | 29 +++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/xmlto.changes b/xmlto.changes
index 7d52aaa..40dc27f 100644
--- a/xmlto.changes
+++ b/xmlto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  6 07:21:10 UTC 2012 - pascal.bleser@opensuse.org
+
+- fixed xsltproc buildrequires and requires for other versions
+- more consistent spec file
+
 -------------------------------------------------------------------
 Wed Dec  5 23:17:29 UTC 2012 - pascal.bleser@opensuse.org
 
diff --git a/xmlto.spec b/xmlto.spec
index 86a8de5..017e903 100644
--- a/xmlto.spec
+++ b/xmlto.spec
@@ -44,7 +44,6 @@ Patch5:         xmlto-lynx-empty-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  flex
-BuildRequires:  libxslt
 BuildRequires:  sgml-skel
 
 %if %{dist_has_fdupes}
@@ -57,14 +56,20 @@ Requires:       docbook_4
 %if 0%{?suse_version} > 1210
 Requires:       libxslt-tools
 BuildRequires:  libxslt-tools
-%endif
-%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1220
+%else
+%if 0%{?suse_version} >= 1210
 Requires:       libxslt1
 BuildRequires:  libxslt1
-%endif
-%if 0%{?suse_version} < 1
+%else
+%if 0%{?suse_version} > 0
+Requires:       libxslt
+BuildRequires:  libxslt
+%else
+BuildRequires:  xsltproc
 Requires:       xsltproc
 %endif
+%endif
+%endif
 # For full functionality, we need passivetex.
 Recommends:     texlive-xmltex >= 2007
 
@@ -83,6 +88,12 @@ for print output it makes use of passivetex.
 cp %{SOURCE10} README.SuSE
 rm -f xmlif/xmlif.c
 
+# make sure the buildrequires pulled in xsltproc
+test -x /usr/bin/xsltproc || {
+    echo "ERROR: buildrequires didn't install xsltproc" >&2
+    exit 1
+}
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -92,7 +103,7 @@ make check
 
 %install
 %make_install
-! mkdir %{buildroot}%{_datadir}/xmlto/xsl
+%__install -d %{buildroot}%{_datadir}/xmlto/xsl
 %if %{dist_has_fdupes}
 %{fdupes '%{buildroot}%{_datadir}/xmlto'}
 %endif
@@ -102,8 +113,10 @@ make check
 %doc README.SuSE
 %doc COPYING
 %doc AUTHORS README ChangeLog FAQ THANKS NEWS
-%{_bindir}/*
-%{_mandir}/*/*
+%{_bindir}/xmlto
+%{_bindir}/xmlif
+%doc %{_mandir}/man1/xmlto.1*
+%doc %{_mandir}/man1/xmlif.1*
 %{_datadir}/xmlto
 
 %changelog