- added info patch (unify direntry)

- check-files cleanup

diff --git a/docbook2X-info.patch b/docbook2X-info.patch
new file mode 100644 (file)
index 0000000..ef7619b
--- /dev/null
+++ b/docbook2X-info.patch
@@ -0,0 +1,51 @@
+Patch only .info not the sources for now (whole regeneration breaks things)
+#--- docbook2X-0.8.8/doc/docbook2X.xml.orig    2006-04-22 17:55:28.000000000 +0200
+#+++ docbook2X-0.8.8/doc/docbook2X.xml 2012-08-25 06:54:03.633416059 +0200
+#@@ -55,7 +55,7 @@
+#     </abstract>
+# 
+#     <subjectset scheme="texinfo-directory">
+#-      <subject><subjectterm>Document Preparation</subjectterm></subject>
+#+      <subject><subjectterm>Text Processing Tools</subjectterm></subject>
+#     </subjectset>
+#     
+#   </articleinfo>
+#--- docbook2X-0.8.8/doc/docbook2X.txml.orig   2007-03-03 14:40:43.000000000 +0100
+#+++ docbook2X-0.8.8/doc/docbook2X.txml        2012-08-25 06:54:04.810082702 +0200
+#@@ -45,7 +45,7 @@
+# <nodenamemapentry id="install-procedure" file="docbook2X"><nodename>Installation</nodename></nodenamemapentry>
+# <nodenamemapentry id="install-problems" file="docbook2X"><nodename>Installation problems</nodename></nodenamemapentry>
+# <nodenamemapentry id="dependencies" file="docbook2X"><nodename>Dependencies on other software</nodename></nodenamemapentry>
+#-<nodenamemapentry id="cindex" file="docbook2X"><nodename>Concept index</nodename></nodenamemapentry></nodenamemap><texinfo file="docbook2X"><settitle>docbook2X</settitle><directory category="Document Preparation"><menuentry file="docbook2X"><menuentrytitle>docbook2X</menuentrytitle><menuentrydescrip>Convert DocBook into man pages and Texinfo</menuentrydescrip></menuentry></directory><node id="docbook2X" previousid="" nextid="quickstart"/><documentlanguage lang="en"/><top>docbook2X</top><indexterm class="cp">DocBook</indexterm><para>
+#+<nodenamemapentry id="cindex" file="docbook2X"><nodename>Concept index</nodename></nodenamemapentry></nodenamemap><texinfo file="docbook2X"><settitle>docbook2X</settitle><directory category="Text Processing Tools"><menuentry file="docbook2X"><menuentrytitle>docbook2X</menuentrytitle><menuentrydescrip>Convert DocBook into man pages and Texinfo</menuentrydescrip></menuentry></directory><node id="docbook2X" previousid="" nextid="quickstart"/><documentlanguage lang="en"/><top>docbook2X</top><indexterm class="cp">DocBook</indexterm><para>
+#     <i>docbook2X</i> converts 
+#     DocBook
+#     documents into man pages and 
+#--- docbook2X-0.8.8/doc/docbook2X.texi.orig   2007-03-03 14:40:45.000000000 +0100
+#+++ docbook2X-0.8.8/doc/docbook2X.texi        2012-08-25 06:54:25.816748930 +0200
+#@@ -2,9 +2,9 @@
+# @setfilename docbook2X.info
+# @documentencoding us-ascii
+# @settitle docbook2X
+#-@dircategory Document Preparation
+#+@dircategory Text Processing Tools:
+# @direntry
+#-* docbook2X: (docbook2X).       Convert DocBook into man pages and Texinfo
+#+* docbook2X: (docbook2X).            Convert DocBook into man pages and Texinfo
+# @end direntry
+# 
+# @node Top, Quick start, , (dir)
+--- docbook2X-0.8.8/doc/docbook2X.info.orig    2007-03-03 14:40:45.000000000 +0100
++++ docbook2X-0.8.8/doc/docbook2X.info 2012-08-25 07:57:11.233337113 +0200
+@@ -1,9 +1,9 @@
+ This is docbook2X.info, produced by makeinfo version 4.8 from
+ docbook2X.texi.
+ 
+-INFO-DIR-SECTION Document Preparation
++INFO-DIR-SECTION Text Processing Tools:
+ START-INFO-DIR-ENTRY
+-* docbook2X: (docbook2X).       Convert DocBook into man pages and Texinfo
++* docbook2X: (docbook2X).             Convert DocBook into man pages and Texinfo
+ END-INFO-DIR-ENTRY
+ 
+ \1f

diff --git a/docbook2X.spec b/docbook2X.spec
index c9a2533de781e1ae90becda42671b2346c7f70a0..c2d7ec814aaa6e3b9d7a4e723548304395544ab9 100644 (file)
--- a/docbook2X.spec
+++ b/docbook2X.spec
@@ -10,8 +10,9 @@ Source0:      http://dl.sourceforge.net/docbook2x/%{name}-%{version}.tar.gz
 # Source0-md5: b9b76a6af198c4f44574cfd17a322f01
 # note: Source1 not used now
 Source1:       %{name}-docbook2man
+Patch0:                %{name}-info.patch
 URL:           http://docbook2x.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: perl-XML-SAX
 BuildRequires: perl-devel
@@ -31,6 +32,7 @@ DocBooka na strony manuala i dokumenty Texinfo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -51,13 +53,30 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/{docbook2man,docbook2X2man}.1
 mv $RPM_BUILD_ROOT%{_bindir}/{docbook2texi,docbook2X2texi}
 mv $RPM_BUILD_ROOT%{_mandir}/man1/{docbook2texi,docbook2X2texi}.1
 
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/docbook2X
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README THANKS TODO doc/*.html
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/db2x_manxml
+%attr(755,root,root) %{_bindir}/db2x_texixml
+%attr(755,root,root) %{_bindir}/db2x_xsltproc
+%attr(755,root,root) %{_bindir}/docbook2X2man
+%attr(755,root,root) %{_bindir}/docbook2X2texi
+%attr(755,root,root) %{_bindir}/sgml2xml-isoent
+%attr(755,root,root) %{_bindir}/utf8trans
 %{_datadir}/%{name}
-%{_mandir}/man1/*
-%{_infodir}/*.info*
+%{_mandir}/man1/db2x_manxml.1*
+%{_mandir}/man1/db2x_texixml.1*
+%{_mandir}/man1/db2x_xsltproc.1*
+%{_mandir}/man1/docbook2X2man.1*
+%{_mandir}/man1/docbook2X2texi.1*
+%{_mandir}/man1/sgml2xml-isoent.1*
+%{_mandir}/man1/utf8trans.1*
+%{_infodir}/docbook2X.info*
+%{_infodir}/docbook2man-xslt.info*
+%{_infodir}/docbook2texi-xslt.info*