- rel 4; debian patch

Changed files:
    docbook-utils-debian.patch -> 1.1
    docbook-utils.spec -> 1.43

diff --git a/docbook-utils-debian.patch b/docbook-utils-debian.patch
new file mode 100644 (file)
index 0000000..1f11215
--- /dev/null
+++ b/docbook-utils-debian.patch
@@ -0,0 +1,33 @@
+--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl
++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl
+@@ -1199,8 +1199,8 @@
+       $_[0] =~ s/\\/\\\\/g;
+ 
+       # Escape dots and single quotes in column 1
+-      $_[0] =~ s/^\./\\\&\./;
+-      $_[0] =~ s/^\'/\\\&\'/;
++      $_[0] =~ s/^[ \t]*\./\\\&\./;
++      $_[0] =~ s/^[ \t]*\'/\\\&\'/;
+ 
+       # In non-'pre'-type elements:
+       if(!$nocollapse_whitespace) {
+--- docbook-utils-0.6.14.orig/helpers/docbook2texi-spec.pl
++++ docbook-utils-0.6.14/helpers/docbook2texi-spec.pl
+@@ -774,7 +774,7 @@
+ ## Print the URL
+ sgml('<ULINK>', sub {
+       if($skip_inline++) { return; }  # hopefully doesn't happen
+-      output '@uref{', output $_[0]->attribute('URL'), ', '
++      output '@uref{', $_[0]->attribute('URL')->value, ', '
+ });
+ sgml('</ULINK>', sub {
+       output '}' unless --$skip_inline;
+@@ -807,6 +807,7 @@
+ sgml('|[lt    ]|', "<");
+ sgml('|[gt    ]|', ">");
+ sgml('|[amp   ]|', "&");
++sgml('|[ndash ]|', "-");
+ 
+ #
+ # Default handlers (uncomment these if needed).  Right now, these are set
+

diff --git a/docbook-utils.spec b/docbook-utils.spec
index 8c9d6ad271268a6cacd07026163e2720deaaff55..61f152ead36fd58cab13215c763c0525e7dc26c0 100644 (file)
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -4,7 +4,7 @@ Summary:        Shell scripts to manage DocBook documents
 Summary(pl.UTF-8):     Skrypty do obróbki dokumentów DocBook
 Name:          docbook-utils
 Version:       0.6.14
-Release:       3
+Release:       4
 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
@@ -13,6 +13,7 @@ Source1:      gdp-both.dsl
 Source2:       db2html
 Patch1:                %{name}-roff_includes_in_man_pages.patch
 Patch2:                %{name}-catalog.patch
+Patch3:                %{name}-debian.patch
 URL:           http://sources.redhat.com/docbook-tools/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -41,6 +42,7 @@ innych formatów (HTML, RTF, PostScript...) i porównywać pliki SGML.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}