- don't obsolete docbook2X (not full replacement, packages no longer conflict)

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

diff --git a/docbook-utils.spec b/docbook-utils.spec
index 36db909c781f61f879e6b224d0bd7fa53b13e6cb..6871bf77647bb75af254e00b1c4acdc3f4004136 100644 (file)
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,25 +1,33 @@
-%include       /usr/lib/rpm/macros.perl
+# TODO - doc
 Summary:       Shell scripts to manage DocBook documents
-Summary(pl):   Skrypty do obróbki dokumentów DocBook
+Summary(pl.UTF-8):     Skrypty do obróbki dokumentów DocBook
 Name:          docbook-utils
-Version:       0.6.11
-Release:       3
+Version:       0.6.14
+Release:       6
 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: 6b41b18c365c01f225bc417cf632d81c
 Source1:       gdp-both.dsl
 Source2:       db2html
 Patch1:                %{name}-roff_includes_in_man_pages.patch
 Patch2:                %{name}-catalog.patch
+Patch3:                %{name}-debian.patch
+Patch4:                %{name}-grep-2.7.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: grep >= 2:2.7
 BuildRequires: openjade >= 1.4-12.20020409
-Obsoletes:     docbook2X
+BuildRequires: perl-SGMLS
+BuildRequires: rpm-perlprov
+Requires:      docbook-style-dsssl >= 1.76-6
+Requires:      jadetex >= 2.5
+Requires:      openjade
+Requires:      perl-SGMLS
+Requires:      which
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,17 +35,19 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 These little scripts allow to convert easily DocBook files to other
 formats (HTML, RTF, PostScript...), and to compare SGML files.
 
-%description -l pl
-Te ma³e skrypty pozwalaj± w prosty sposób konwertowaæ pliki DocBook do
-innych formatów (HTML, RTF, PostScript...) i porównywaæ pliki SGML.
+%description -l pl.UTF-8
+Te małe skrypty pozwalają w prosty sposób konwertować pliki DocBook do
+innych formatów (HTML, RTF, PostScript...) i porównywać pliki SGML.
 
 %prep
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
@@ -49,18 +59,20 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f doc/HTML/Makefile*
-rm -f doc/HTML/*.in
+%{__rm} doc/HTML/Makefile*
 
-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 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/db2html
+
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc/html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,10 +80,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc NEWS README TODO doc/HTML
-%attr(755,root,root) %{_bindir}/jw
-%attr(755,root,root) %{_bindir}/docbook2*
 %attr(755,root,root) %{_bindir}/db2*
+%attr(755,root,root) %{_bindir}/docbook2*
+%attr(755,root,root) %{_bindir}/jw
 %attr(755,root,root) %{_bindir}/sgmldiff
 %{_datadir}/sgml/docbook/utils-%{version}
-%{_mandir}/man1/*
-%{_mandir}/man7/*
+%{_mandir}/man1/db2*.1*
+%{_mandir}/man1/docbook2*.1*
+%{_mandir}/man1/jw.1*
+%{_mandir}/man1/sgmldiff.1*
+%{_mandir}/man7/backend-spec.7*
+%{_mandir}/man7/frontend-spec.7*