rpms/linuxdoc-tools/devel linuxdoc-tools-ifpdf.patch, NONE, 1.1 linuxdoc-tools.spec, 1.22, 1.23 linuxdoc-tools-0.9.21-badif.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 11 15:17:43 UTC 2007


Author: twaugh

Update of /cvs/dist/rpms/linuxdoc-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9340

Modified Files:
	linuxdoc-tools.spec 
Added Files:
	linuxdoc-tools-ifpdf.patch 
Removed Files:
	linuxdoc-tools-0.9.21-badif.patch 
Log Message:
* Thu Jan 11 2007 Tim Waugh <twaugh at redhat.com> 0.9.21-8
- Applied patch from Kir Kolyshkin (bug #204902):
  - added a patch from debian bug #321998 (obsoletes patch -badif)
- Resolves: rhbz#204902 rhbz#321998


linuxdoc-tools-ifpdf.patch:
 mapping    |   32 ++++----------------------------
 tr-mapping |   32 ++++----------------------------
 2 files changed, 8 insertions(+), 56 deletions(-)

--- NEW FILE linuxdoc-tools-ifpdf.patch ---
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 @@
 </qwertz>	+
 
 <article>	+ "\\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 @@
 </article>	+	"\\end{document}"	+
 
 <report>	+ "\\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 @@
 </report>	+	"\\end{document}"	+
 
 <book>	+ 	"\\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 @@
 
 
 <notes> +	"\\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 @@
 </qwertz>	+
 
 <article>	+ "\\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 @@
 </article>	+	"\\end{document}"	+
 
 <report>	+ "\\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 @@
 </report>	+	"\\end{document}"	+
 
 <book>	+ 	"\\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 @@
 
 
 <notes> +	"\\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"


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linuxdoc-tools.spec	12 Jul 2006 07:13:48 -0000	1.22
+++ linuxdoc-tools.spec	11 Jan 2007 15:17:41 -0000	1.23
@@ -5,14 +5,14 @@
 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 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 11 2007 Tim Waugh <twaugh at redhat.com> 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 <jkeating at redhat.com> - 0.9.21-7.1
 - rebuild
 


--- linuxdoc-tools-0.9.21-badif.patch DELETED ---




More information about the fedora-cvs-commits mailing list