- updated to 6.6

diff --git a/regex-fix.patch b/regex-fix.patch
deleted file mode 100644 (file)
index ac56456..0000000
--- a/regex-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1f27900352e04ff4f19bec1c1e9635adad2be31c Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Fri, 18 May 2018 10:40:00 +0100
-Subject: [PATCH] Fix unescaped left braces in regexps, deprecated since Perl
- 5.27.8
-
-This fixes test failures on recent Perl versions.
----
- tp/Texinfo/Parser.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
-index dc32ca2..c577aa9 100644
---- a/tp/Texinfo/Parser.pm
-+++ b/tp/Texinfo/Parser.pm
-@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$)
-     }
-   } elsif ($command eq 'clickstyle') {
-     # REMACRO
--    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
-+    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
-       $args = ['@'.$1];
-       $self->{'clickstyle'} = $1;
-       $remaining = $line;
--      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-+      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
-       $has_comment = 1 if (defined($4));
-     } else {
-       $self->line_error (sprintf($self->__(
--- 
-2.17.0
-

diff --git a/texinfo-info.patch b/texinfo-info.patch
index a61d98a37e8de65e84f1b47fd39e937d709f4ff9..d702129e7bf721289a5b4db8e63d920715de5b30 100644 (file)
--- a/texinfo-info.patch
+++ b/texinfo-info.patch
@@ -52,9 +52,9 @@
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
 @@ -571,7 +571,7 @@
+ * A4 Paper::                    How to print on A4 or A5 paper.
  * @code{@@pagesizes}::                  How to print with customized page sizes.
- * Cropmarks and Magnification:: How to print marks to indicate the size
-                                  of pages and how to print scaled up output.
+ * Magnification::               How to print scaled up output.
 -* PDF Output::                  Portable Document Format output.
 +* texi2pdf::                    Portable Document Format output.
  * Obtaining @TeX{}::               How to obtain @TeX{}.
@@ -147,9 +147,9 @@
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
 @@ -14850,7 +14849,7 @@
+ * A4 Paper::                    How to print on A4 or A5 paper.
  * @code{@@pagesizes}::                  How to print with customized page sizes.
- * Cropmarks and Magnification:: How to print marks to indicate the size
-                                  of pages and how to print scaled up output.
+ * Magnification::               How to print scaled up output.
 -* PDF Output::                  Portable Document Format output.
 +* texi2pdf::                    Portable Document Format output.
  * Obtaining @TeX{}::               How to obtain @TeX{}.
@@ -358,9 +358,9 @@
  
  @pindex install-info
 @@ -18716,7 +18715,7 @@
- @pindex html32.pm
  Some known exceptions to HTML@tie{}3.2 (using
- @samp{--init-file=html32.pm} produces strict HTML@tie{}3.2 output;
+ @samp{--init-file=html32.pm} produced strict HTML@tie{}3.2 output, but
+ this has not been tested lately;
 -@pxref{Invoking @command{texi2any}}):
 +@pxref{@command{texi2any}}):
  

diff --git a/texinfo.spec b/texinfo.spec
index 2131d42d5b3bcc0798c6ccd0e09a1eee768e0d24..e6a183b8580ec88c796c52eb02a8e4539f1bb50d 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -9,15 +9,14 @@ Summary(ru.UTF-8):    Инструменты для создания файлов 
 Summary(tr.UTF-8):     texinfo biçimleyici ve info okuyucu
 Summary(uk.UTF-8):     Інструменти для створення файлів документації формату Texinfo
 Name:          texinfo
-Version:       6.5
-Release:       2
+Version:       6.6
+Release:       1
 License:       GPL v3+
 Group:         Applications/Publishing
 Source0:       http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.xz
-# Source0-md5: 3715197e62e0e07f85860b3d7aab55ed
+# Source0-md5: 5231da3e6aa106cd0532b8609e5b3702
 Source1:       info.desktop
 Patch0:                %{name}-info.patch
-Patch1:                regex-fix.patch
 URL:           http://www.gnu.org/software/texinfo/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
@@ -188,7 +187,6 @@ Narzędzie do konwersji plików texinfo na dvi.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal} -I gnulib/m4
@@ -252,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/texinfo
 %attr(755,root,root) %{_libdir}/texinfo/MiscXS.so
 %attr(755,root,root) %{_libdir}/texinfo/XSParagraph.so
+%attr(755,root,root) %{_libdir}/texinfo/Parsetexi.so
 %{_infodir}/texinfo*.info*
 %{_mandir}/man1/makeinfo.1*
 %{_mandir}/man1/pod2texi.1*