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