From 3f86c7eb759efcb7385a48d1532577df4a1a326b Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Wed, 3 Dec 2008 13:41:34 +0000 Subject: [PATCH] Use latest upstream release 0.9.56, removed already applied patches --- .cvsignore | 3 +- linuxdoc-tools-0.9.20-lib64.patch | 7 +- linuxdoc-tools-0.9.20-strip.patch | 10 --- linuxdoc-tools-apostrophestart.patch | 11 --- linuxdoc-tools-fi.patch | 50 ----------- linuxdoc-tools-ifpdf.patch | 126 --------------------------- linuxdoc-tools.spec | 20 ++--- sources | 2 +- 8 files changed, 12 insertions(+), 217 deletions(-) delete mode 100644 linuxdoc-tools-0.9.20-strip.patch delete mode 100644 linuxdoc-tools-apostrophestart.patch delete mode 100644 linuxdoc-tools-fi.patch delete mode 100644 linuxdoc-tools-ifpdf.patch diff --git a/.cvsignore b/.cvsignore index ffb1b11..e19d988 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -linuxdoc-tools_0.9.20.tar.gz -linuxdoc-tools_0.9.21.tar.gz +linuxdoc-tools_0.9.56.tar.gz diff --git a/linuxdoc-tools-0.9.20-lib64.patch b/linuxdoc-tools-0.9.20-lib64.patch index 04816c4..f13638a 100644 --- a/linuxdoc-tools-0.9.20-lib64.patch +++ b/linuxdoc-tools-0.9.20-lib64.patch @@ -1,13 +1,10 @@ --- linuxdoc-tools-0.9.20/bin/linuxdoc.in.orig 2002-09-10 14:31:56.000000000 -0400 +++ linuxdoc-tools-0.9.20/bin/linuxdoc.in 2002-09-10 14:32:32.000000000 -0400 -@@ -23,8 +23,10 @@ +@@ -23,6 +23,7 @@ use lib "@DATADIR@"; use lib "@prefix@/perl5"; +use lib "@prefix@/lib64/perl5"; use lib "@prefix@/lib/perl5"; use lib "@prefix@/share/perl5"; -+ - $progs = { - "NSGMLS" => "@NSGMLS@", - "SGMLSASP" => "@SGMLSASP@", + diff --git a/linuxdoc-tools-0.9.20-strip.patch b/linuxdoc-tools-0.9.20-strip.patch deleted file mode 100644 index 198bd24..0000000 --- a/linuxdoc-tools-0.9.20-strip.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linuxdoc-tools-0.9.20/Makefile.in.strip Mon Apr 22 17:30:06 2002 -+++ linuxdoc-tools-0.9.20/Makefile.in Mon Apr 22 17:30:19 2002 -@@ -87,7 +87,6 @@ - ( cd iso-entities; \ - $(MAKE) install ) - endif -- strip sgmlpre/sgmlpre - for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \ - bn=`basename $$ii`; \ - $(INSTALL_PROGRAM) $$ii $(bindir)/$$bn; \ diff --git a/linuxdoc-tools-apostrophestart.patch b/linuxdoc-tools-apostrophestart.patch deleted file mode 100644 index 82746fe..0000000 --- a/linuxdoc-tools-apostrophestart.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urNp linuxdoc-tools-0.9.21/lib/dist/fmt_txt.pl devel/lib/dist/fmt_txt.pl ---- linuxdoc-tools-0.9.21/lib/dist/fmt_txt.pl 2001-12-23 14:08:49.000000000 +0100 -+++ devel/lib/dist/fmt_txt.pl 2007-06-19 14:35:30.000000000 +0200 -@@ -78,6 +78,7 @@ my $txt_escape = sub { - - $data =~ s|"|\\\&\"|g; # Insert zero-width space in front of " - $data =~ s|^\.|\\&.|; # ditto in front of . at start of line -+ $data =~ s|^\'|\\&\'|; # ditto in front of ' at start of line - $data =~ s|\\|\\\\|g; # Escape backslashes - - return ($data); diff --git a/linuxdoc-tools-fi.patch b/linuxdoc-tools-fi.patch deleted file mode 100644 index cc9e31f..0000000 --- a/linuxdoc-tools-fi.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- linuxdoc-tools-0.9.21/lib/LinuxDocTools/Lang.pm.fi 2001-05-24 16:57:41.000000000 +0100 -+++ linuxdoc-tools-0.9.21/lib/LinuxDocTools/Lang.pm 2005-06-30 13:09:18.000000000 +0100 -@@ -64,6 +64,7 @@ - ja japanese japanese - pl polski polish - ko korean korean -+ fi suomi finnish - ); - - -@@ -170,7 +171,8 @@ - "ro" => "Înapoi", - "ja" => "Á°¤Î¥Ú¡¼¥¸", - "pl" => "Poprzedni", -- "ko" => "ÀÌÀü" -+ "ko" => "ÀÌÀü", -+ "fi" => "Edellinen" - }, - "Next" => { - "nl" => "Verder", -@@ -186,7 +188,8 @@ - "ro" => "Înainte", - "ja" => "¼¡¤Î¥Ú¡¼¥¸", - "pl" => "Nastny", -- "ko" => "´ÙÀ½" -+ "ko" => "´ÙÀ½", -+ "fi" => "Seuraava" - }, - "Contents" => { - "nl" => "Inhoud", -@@ -202,7 +205,8 @@ - "ro" => "Cuprins", - "ja" => "Ìܼ¡¤Ø", - "pl" => "Spis Trei", -- "ko" => "Â÷·Ê" -+ "ko" => "Â÷·Ê", -+ "fi" => "Sisällys" - }, - "Table of Contents" => { - "nl" => "Inhoudsopgave", -@@ -218,7 +222,8 @@ - "ro" => "Cuprins", - "ja" => "Ìܼ¡", - "pl" => "Spis Trei", -- "ko" => "Â÷·Ê" -+ "ko" => "Â÷·Ê", -+ "fi" => "Sisällysluettelo" - } - }; - diff --git a/linuxdoc-tools-ifpdf.patch b/linuxdoc-tools-ifpdf.patch deleted file mode 100644 index d28b8ce..0000000 --- a/linuxdoc-tools-ifpdf.patch +++ /dev/null @@ -1,126 +0,0 @@ -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 670b7ed..dba0521 100644 --- a/linuxdoc-tools.spec +++ b/linuxdoc-tools.spec @@ -2,17 +2,13 @@ Summary: A text formatting package based on SGML Name: linuxdoc-tools -Version: 0.9.21 -Release: 17%{?dist} +Version: 0.9.56 +Release: 1%{?dist} License: Freely redistributable without restriction 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-ifpdf.patch -Patch4: linuxdoc-tools-fi.patch -Patch5: linuxdoc-tools-apostrophestart.patch +Patch1: linuxdoc-tools-0.9.20-lib64.patch Url: http://packages.qa.debian.org/l/linuxdoc-tools.html BuildRoot: %{_tmppath}/%{name}-root BuildRequires: flex sgml-common jade gawk groff autoconf @@ -37,11 +33,7 @@ documentation. %prep %setup -q %patch0 -p1 -%patch1 -p1 -b .strip -%patch2 -p1 -b .lib64 -%patch3 -p1 -b .badif -%patch4 -p1 -b .fi -%patch5 -p1 -b .apostrophe +%patch1 -p1 -b .lib64 %build %configure --with-installed-nsgmls --with-installed-iso-entities @@ -101,6 +93,10 @@ exit 0 %{_mandir}/*/* %changelog +* Wed Dec 03 2008 Ondrej Vasik 0.9-56-1 +- Used latest upstream version 0.9.56, + removed already applied patches + * Fri Aug 29 2008 Ondrej Vasik 0.9.21-17 - patch fuzz clean up diff --git a/sources b/sources index b574c1c..3bc3f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55e2575d96cd91316b7ad269c0b797c3 linuxdoc-tools_0.9.21.tar.gz +1cfe10e279394731b65fdac4f72ff5eb linuxdoc-tools_0.9.56.tar.gz