- second part of small fixes inspired by kloczek (this time better checked,

[packages/docbook-utils.git] / docbook-utils.spec

diff --git a/docbook-utils.spec b/docbook-utils.spec
index 44b4aef37df0ab67ddde41e6613211cbea486737..9ac73c36412067e97cd1288f2f42d1cfcd13b28d 100644 (file)
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -2,23 +2,24 @@
 Summary:       Shell scripts to manage DocBook documents
 Summary(pl):   Skrypty do obróbki dokumentów DocBook
 Name:          docbook-utils
-Version:       0.6.11
-Release:       2
+Version:       0.6.13
+Release:       1
 License:       Eric Bischoff, Mark Galassi, Jochem Huhmann, Steve Cheng, and Frederik Fouvry; GPL 2.0
 Group:         Applications/Publishing/SGML
 Source0:       ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz
+# Source0-md5: af785716b207a7a562551851298a3b1a
 Source1:       gdp-both.dsl
 Source2:       db2html
 Patch1:                %{name}-roff_includes_in_man_pages.patch
 Patch2:                %{name}-catalog.patch
 URL:           http://sources.redhat.com/docbook-tools/
-Requires:      docbook-style-dsssl >= 1.76-6
-Requires:      jadetex >= 2.5
-Requires:      tetex-fonts
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: docbook-dtd31-sgml
 BuildRequires: docbook-style-dsssl
 BuildRequires: openjade >= 1.4-12.20020409
+Requires:      docbook-style-dsssl >= 1.76-6
+Requires:      jadetex >= 2.5
 Obsoletes:     docbook2X
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,7 +38,7 @@ innych format
 %patch2 -p1
 
 %build
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
@@ -52,15 +53,15 @@ rm -rf $RPM_BUILD_ROOT
 rm -f doc/HTML/Makefile*
 rm -f doc/HTML/*.in
 
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
-sed 's/^ "USletter"/ "A4"/' %{SOURCE1} > $RPM_BUILD_ROOT/%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
+sed 's/^ "USletter"/ "A4"/' %{SOURCE1} > $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
 
 for util in dvi html pdf ps rtf man texi tex ; do
-       ln -sf docbook2${util} $RPM_BUILD_ROOT/%{_bindir}/db2${util}
-       echo '.so jw.1' >$RPM_BUILD_ROOT/%{_mandir}/man1/db2${util}.1
+       ln -sf docbook2${util} $RPM_BUILD_ROOT%{_bindir}/db2${util}
+       echo '.so jw.1' >$RPM_BUILD_ROOT%{_mandir}/man1/db2${util}.1
 done
 
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/db2html
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/db2html
 
 %clean
 rm -rf $RPM_BUILD_ROOT