diff --git a/linuxdoc-tools-ifpdf.patch b/linuxdoc-tools-ifpdf.patch
new file mode 100644
index 0000000..d28b8ce
--- /dev/null
+++ b/linuxdoc-tools-ifpdf.patch
@@ -0,0 +1,126 @@
+diff -Nur linuxdoc-tools-0.9.21.orig/lib/dist/linuxdoc-tools/latex2e/mapping linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping
+--- linuxdoc-tools-0.9.21.orig/lib/dist/linuxdoc-tools/latex2e/mapping 2002-01-28 18:44:44.000000000 +0100
++++ linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping 2005-08-08 18:23:11.578297567 +0200
+@@ -7,13 +7,7 @@
+ +
+
+ + "\\documentclass\[a4paper\]{article}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -35,13 +29,7 @@
+ + "\\end{document}" +
+
+ + "\\documentclass\[a4paper\]{report}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -64,13 +52,7 @@
+ + "\\end{document}" +
+
+ + "\\documentclass\[a4paper\]{book}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -94,13 +76,7 @@
+
+
+ + "\\documentclass\[a4paper\]{article}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoc-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+diff -Nur linuxdoc-tools-0.9.21.orig/lib/dist/linuxdoc-tools/latex2e/tr-mapping linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping
+--- linuxdoc-tools-0.9.21.orig/lib/dist/linuxdoc-tools/latex2e/tr-mapping 2002-01-28 18:44:45.000000000 +0100
++++ linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping 2005-08-08 18:21:19.393440399 +0200
+@@ -7,13 +7,7 @@
+ +
+
+ + "\\documentclass\[a4paper\]{article}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoctr-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -35,13 +29,7 @@
+ + "\\end{document}" +
+
+ + "\\documentclass\[a4paper\]{report}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoctr-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -64,13 +52,7 @@
+ + "\\end{document}" +
+
+ + "\\documentclass\[a4paper\]{book}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoctr-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
+@@ -94,13 +76,7 @@
+
+
+ + "\\documentclass\[a4paper\]{article}\n"
+- "\\newif\\ifpdf\n"
+- "\\ifx\\pdfoutput\\undefined\n"
+- " \\pdffalse % we do not use PDFLaTeX\n"
+- "\\else\n"
+- " \\pdfoutput=1 % we use PDFLaTeX\n"
+- " \\pdftrue\n"
+- "\\fi\n"
++ "\\usepackage{ifpdf}\n"
+ "\\usepackage{linuxdoctr-sgml}\n"
+ "\\usepackage{qwertz}\n"
+ "\\usepackage{url}\n"
diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index 393ff32..f29a9c7 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -5,14 +5,14 @@ Name: linuxdoc-tools
Obsoletes: sgml-tools
Obsoletes: linuxdoc-sgml
Version: 0.9.21
-Release: 7.1
+Release: 8%{?dist}
License: Freely distributable
Group: Applications/Publishing
Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
Patch0: linuxdoc-tools-0.9.13-letter.patch
Patch1: linuxdoc-tools-0.9.20-strip.patch
Patch2: linuxdoc-tools-0.9.20-lib64.patch
-Patch3: linuxdoc-tools-0.9.21-badif.patch
+Patch3: linuxdoc-tools-ifpdf.patch
Patch4: linuxdoc-tools-fi.patch
Requires: jade
Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
@@ -100,6 +100,10 @@ exit 0
%{_mandir}/*/*
%changelog
+* Thu Jan 11 2007 Tim Waugh 0.9.21-8
+- Applied patch from Kir Kolyshkin (bug #204902):
+ - added a patch from debian bug #321998 (obsoletes patch -badif)
+
* Wed Jul 12 2006 Jesse Keating - 0.9.21-7.1
- rebuild