Accepting request 145260 from Publishing

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/145260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlto?expand=0&rev=25

xmlto.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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
@@ -43,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}
@@ -53,7 +53,23 @@ 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
+%else
+%if 0%{?suse_version} >= 1210
+Requires:       libxslt1
+BuildRequires:  libxslt1
+%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
 
@@ -72,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}
@@ -81,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
@@ -91,8 +113,10 @@ make check
 %doc README.SuSE
 %doc COPYING
 %doc AUTHORS README ChangeLog FAQ THANKS NEWS
-%{_bindir}/*
+%{_bindir}/xmlto
-%{_mandir}/*/*
+%{_bindir}/xmlif
+%doc %{_mandir}/man1/xmlto.1*
+%doc %{_mandir}/man1/xmlif.1*
 %{_datadir}/xmlto
 
 %changelog