Hello community, here is the log from the commit of package xmlto for openSUSE:Factory checked in at 2012-12-19 14:11:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlto (Old) and /work/SRC/openSUSE:Factory/.xmlto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlto", Maintainer is "k...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlto/xmlto.changes 2012-06-15 16:31:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlto.new/xmlto.changes 2012-12-19 14:11:43.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 6 07:21:10 UTC 2012 - pascal.ble...@opensuse.org + +- fixed xsltproc buildrequires and requires for other versions +- more consistent spec file + +------------------------------------------------------------------- +Wed Dec 5 23:17:29 UTC 2012 - pascal.ble...@opensuse.org + +- add explicit requires for libxslt-tools or libxslt1 in order to + fix "have choice" in several repos + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlto.spec ++++++ --- /var/tmp/diff_new_pack.5H7PpT/_old 2012-12-19 14:11:44.000000000 +0100 +++ /var/tmp/diff_new_pack.5H7PpT/_new 2012-12-19 14:11:44.000000000 +0100 @@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-xsl-stylesheets BuildRequires: flex -BuildRequires: libxslt BuildRequires: sgml-skel %if %{dist_has_fdupes} @@ -53,7 +53,23 @@ # 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 @@ 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 @@ %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 @@ %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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
