Hello community, here is the log from the commit of package xindy for openSUSE:Factory checked in at 2017-10-26 18:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xindy (Old) and /work/SRC/openSUSE:Factory/.xindy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xindy" Thu Oct 26 18:44:15 2017 rev:13 rq:535046 version:2.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xindy/xindy.changes 2016-04-08 09:39:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xindy.new/xindy.changes 2017-10-26 18:44:15.812288882 +0200 @@ -1,0 +2,15 @@ +Wed Oct 11 22:27:43 UTC 2017 - [email protected] + +- Update to new upstream release 2.5.1 + * Support for MikTeX. + * New language translations for Persian and Korean. + * Corrected sorting in Polytonik Greek, Vietnamese. + * By default, make-rules documentation is not created. + * texindy utf8 codepage for Latin scripts supported. +- Drop fix-alphabets-doc-geometry.dpatch.diff, + fix-configure.dpatch.diff, fix-echo-expansion.dpatch.diff, + fix-entry-with-command.dpatch.diff (merged upstream) +- Add 1000_Unescaped-left-brace-deprecated-in-regexps.diff +- Re-copy fix-FHS.dpatch.diff, help-option.dpatch.diff from Debian. + +------------------------------------------------------------------- Old: ---- fix-alphabets-doc-geometry.dpatch.diff fix-configure.dpatch.diff fix-echo-expansion.dpatch.diff fix-entry-with-command.dpatch.diff xindy-2.4.tar.xz New: ---- 1000_Unescaped-left-brace-deprecated-in-regexps.diff xindy-2.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xindy.spec ++++++ --- /var/tmp/diff_new_pack.kpV35L/_old 2017-10-26 18:44:16.792243147 +0200 +++ /var/tmp/diff_new_pack.kpV35L/_new 2017-10-26 18:44:16.792243147 +0200 @@ -1,7 +1,7 @@ # # spec file for package xindy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,41 +17,36 @@ Name: xindy -Version: 2.4 +Version: 2.5.1 Release: 0 Summary: Index generator for structured documents like LaTeX or SGML -License: GPL-2.0 +License: GPL-2.0+ Group: Productivity/Text/Utilities -Url: http://xindy.sf.net/ +Url: http://xindy.org/ #DL-URL: http://ctan.org/tex-archive/indexing/xindy/ -Source: xindy-2.4.tar.xz -Patch1: fix-echo-expansion.dpatch.diff -Patch2: fix-FHS.dpatch.diff -Patch4: help-option.dpatch.diff -Patch5: fix-alphabets-doc-geometry.dpatch.diff -Patch6: fix-configure.dpatch.diff -Patch7: fix-entry-with-command.dpatch.diff +Source: ftp://ctan.org/tex-archive/indexing/xindy/base/xindy-2.5.1.tar.gz +Patch1: fix-FHS.dpatch.diff +Patch2: help-option.dpatch.diff +Patch3: 1000_Unescaped-left-brace-deprecated-in-regexps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: automake BuildRequires: clisp BuildRequires: flex -BuildRequires: texlive-latex -%if %suse_version > 1220 +BuildRequires: libtool BuildRequires: texlive-cm-super BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-latex BuildRequires: texlive-lh BuildRequires: texlive-metafont BuildRequires: tex(pdftex.map) BuildRequires: tex(t2aenc.def) -%endif %if %suse_version > 1230 BuildRequires: tex(lgrcmr.fd) BuildRequires: tex(lgrenc.def) %endif -BuildRequires: xz # Need this at runtime for indexing to work correctly: Requires: clisp - Requires: xindy-rules = %version # clisp is not present ExcludeArch: armv4l ppc64 ppc64le s390x @@ -90,19 +85,21 @@ %prep %setup -q -%patch -P 1 -P 2 -P 4 -P 5 -P 6 -P 7 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build +autoreconf -fi %configure --docdir=%_docdir/%name # not safe for -j make -j1 %install -make install DESTDIR="%buildroot"; -rm -f "%buildroot/%_prefix/VERSION"; +%make_install +rm -f "%buildroot/%_prefix/VERSION" %files %defattr(-,root,root) +%doc COPYING %_bindir/* %_libdir/%name @@ -113,6 +110,5 @@ %files doc %defattr(-,root,root) %doc %_mandir/man*/* -%doc %_docdir/* %changelog ++++++ 1000_Unescaped-left-brace-deprecated-in-regexps.diff ++++++ Author: Agustin Martin Domingo <[email protected]> Description: Handle perl 5.22 deprecation of unescaped left brace in regular expressions. Bug-Debian: https://bugs.debian.org/826507 This is to deal with new perl 5.22 warning about that Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\\indexentry{ <-- HERE (.+)--([8-9a-f][0-9a-f])\}\{1\}/ at ./make-inp-rules.pl line 11. --- a/make-rules/inputenc/make-inp-rules.pl +++ b/make-rules/inputenc/make-inp-rules.pl @@ -8,7 +8,7 @@ while (<STDIN>) { - if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { + if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) { if (!($1 =~ /inputenc Error|\@inpenc\@undefined/)) { $i = hex($2); $macro = $1; ++++++ fix-FHS.dpatch.diff ++++++ --- /var/tmp/diff_new_pack.kpV35L/_old 2017-10-26 18:44:16.816242027 +0200 +++ /var/tmp/diff_new_pack.kpV35L/_new 2017-10-26 18:44:16.816242027 +0200 @@ -6,37 +6,29 @@ @DPATCH@ --- + make-rules/alphabets/Makefile.am | 2 +- make-rules/alphabets/Makefile.in | 2 +- + make-rules/inputenc/Makefile.am | 2 +- make-rules/inputenc/Makefile.in | 2 +- - make-rules/styles/Makefile.in | 2 +- - modules/base/Makefile.in | 2 +- - modules/class/Makefile.in | 2 +- - modules/lang/german/Makefile.in | 2 +- - modules/lang/latin/Makefile.in | 2 +- - modules/ord/Makefile.in | 2 +- - modules/rules/Makefile.in | 2 +- - modules/styles/Makefile.in | 2 +- + modules/Makefile.am | 2 +- + modules/Makefile.in | 2 +- user-commands/xindy.in | 12 +++++++----- - 11 files changed, 17 insertions(+), 15 deletions(-) + 7 files changed, 13 insertions(+), 11 deletions(-) -Index: xindy-2.4/make-rules/alphabets/Makefile.in -=================================================================== ---- xindy-2.4.orig/make-rules/alphabets/Makefile.in -+++ xindy-2.4/make-rules/alphabets/Makefile.in -@@ -253,7 +253,7 @@ target_alias = @target_alias@ +--- xindy.git.orig/make-rules/alphabets/Makefile.in ++++ xindy.git/make-rules/alphabets/Makefile.in +@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -langdir = $(pkglibdir)/modules/lang +langdir = $(pkgdatadir)/lang - DISTCLEANFILES = albanian/utf8.pl belarusian/utf8.pl bulgarian/utf8.pl \ - croatian/utf8.pl czech/utf8.pl danish/utf8.pl \ - dutch/ij-as-ij-utf8.pl dutch/ij-as-y-utf8.pl english/utf8.pl \ -Index: xindy-2.4/make-rules/inputenc/Makefile.in -=================================================================== ---- xindy-2.4.orig/make-rules/inputenc/Makefile.in -+++ xindy-2.4/make-rules/inputenc/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ + nobase_nodist_lang_DATA = albanian/latin1-lang.xdy \ + albanian/latin1-test.xdy albanian/latin1.xdy \ + albanian/utf8-lang.xdy albanian/utf8-test.xdy \ +--- xindy.git.orig/make-rules/inputenc/Makefile.in ++++ xindy.git/make-rules/inputenc/Makefile.in +@@ -259,7 +259,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -45,115 +37,9 @@ inputencdir = $(modulesdir)/tex/inputenc INPUTENCS = \ cp1250.xdy \ -Index: xindy-2.4/make-rules/styles/Makefile.in -=================================================================== ---- xindy-2.4.orig/make-rules/styles/Makefile.in -+++ xindy-2.4/make-rules/styles/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - stylesdir = $(modulesdir)/styles - STYLES = \ - example.xdy \ -Index: xindy-2.4/modules/base/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/base/Makefile.in -+++ xindy-2.4/modules/base/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - basedir = $(modulesdir)/base - RULES = \ - book-order.xdy \ -Index: xindy-2.4/modules/class/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/class/Makefile.in -+++ xindy-2.4/modules/class/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - classdir = $(modulesdir)/class - RULES = \ - pagenums.xdy -Index: xindy-2.4/modules/lang/german/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/lang/german/Makefile.in -+++ xindy-2.4/modules/lang/german/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --langdir = $(pkglibdir)/modules/lang -+langdir = $(pkgdatadir)/lang - germandir = $(langdir)/german - RULES = \ - din5007.xdy \ -Index: xindy-2.4/modules/lang/latin/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/lang/latin/Makefile.in -+++ xindy-2.4/modules/lang/latin/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --langdir = $(pkglibdir)/modules/lang -+langdir = $(pkgdatadir)/lang - latindir = $(langdir)/latin - RULES = \ - caseisrt.xdy \ -Index: xindy-2.4/modules/ord/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/ord/Makefile.in -+++ xindy-2.4/modules/ord/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - orddir = $(modulesdir)/ord - RULES = \ - letorder.xdy -Index: xindy-2.4/modules/rules/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/rules/Makefile.in -+++ xindy-2.4/modules/rules/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - rulesdir = $(modulesdir)/rules - RULES = \ - isolatin1-exchange.xdy \ -Index: xindy-2.4/modules/styles/Makefile.in -=================================================================== ---- xindy-2.4.orig/modules/styles/Makefile.in -+++ xindy-2.4/modules/styles/Makefile.in -@@ -154,7 +154,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --modulesdir = $(pkglibdir)/modules -+modulesdir = $(pkgdatadir) - texdir = $(modulesdir)/styles - RULES = basic.xdy makeidx.xdy - EXTRA_DIST = $(RULES) -Index: xindy-2.4/user-commands/xindy.in -=================================================================== ---- xindy-2.4.orig/user-commands/xindy.in -+++ xindy-2.4/user-commands/xindy.in -@@ -414,11 +414,13 @@ if ( $real_cmd =~ /\.pl$/ ) { # TeX Live +--- xindy.git.orig/user-commands/xindy.in ++++ xindy.git/user-commands/xindy.in +@@ -456,11 +456,13 @@ } # modules directory @@ -172,3 +58,47 @@ die "$cmd: Cannot locate xindy modules directory"; } +--- xindy.git.orig/modules/Makefile.in ++++ xindy.git/modules/Makefile.in +@@ -263,7 +263,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + nobase_modules_DATA = base/book-order.xdy base/ff-ranges-only.xdy \ + base/ff-ranges.xdy base/german-sty.xdy base/ignore-hyphen.xdy \ + base/ignore-punctuation.xdy base/keep-blanks.xdy \ +--- xindy.git.orig/make-rules/alphabets/Makefile.am ++++ xindy.git/make-rules/alphabets/Makefile.am +@@ -19,7 +19,7 @@ + ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + ## Boston, MA 02110-1301 USA. + +-langdir = $(pkglibdir)/modules/lang ++langdir = $(pkgdatadir)/lang + + nobase_nodist_lang_DATA = + EXTRA_DIST = +--- xindy.git.orig/make-rules/inputenc/Makefile.am ++++ xindy.git/make-rules/inputenc/Makefile.am +@@ -19,7 +19,7 @@ + ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + ## Boston, MA 02110-1301 USA. + +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + + inputencdir = $(modulesdir)/tex/inputenc + +--- xindy.git.orig/modules/Makefile.am ++++ xindy.git/modules/Makefile.am +@@ -21,7 +21,7 @@ + ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + ## Boston, MA 02110-1301 USA. + +-modulesdir = $(pkglibdir)/modules ++modulesdir = $(pkgdatadir) + + nobase_modules_DATA = + ++++++ help-option.dpatch.diff ++++++ --- /var/tmp/diff_new_pack.kpV35L/_old 2017-10-26 18:44:16.824241654 +0200 +++ /var/tmp/diff_new_pack.kpV35L/_new 2017-10-26 18:44:16.824241654 +0200 @@ -5,24 +5,28 @@ ## DP: message to stderr. @DPATCH@ -diff --git a/user-commands/texindy b/user-commands/texindy -index e29e4e1..06dff2b 100755 ---- a/user-commands/texindy.in -+++ b/user-commands/texindy.in -@@ -322,9 +322,9 @@ use Getopt::Long qw(:config bundling); +--- + user-commands/texindy.in | 9 ++++----- + user-commands/xindy.in | 9 ++++----- + 2 files changed, 8 insertions(+), 10 deletions(-) + +--- xindy.git.orig/user-commands/texindy.in ++++ xindy.git/user-commands/texindy.in +@@ -456,10 +456,9 @@ sub usage ( ;$ ) { - my $exit_code = shift; - $exit_code += 0; # turn undef into 0 -- print STDERR <<_EOT_ +- my $out = ( $exit_code ? *STDERR : *STDOUT ); +- print $out <<_EOT_ + my $signal_error = int shift; + my $output_handle = $signal_error ? *STDERR{IO} : *STDOUT{IO}; + print $output_handle <<_EOT_ usage: $cmd [-V?h] [-qv] [-iglr] [-d magic] [-o outfile.ind] [-t log] \\ [-L lang] [-C codepage] [-M module] [-I input] [idx0 idx1 ...] -@@ -350,7 +350,7 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: +@@ -485,7 +484,7 @@ _EOT_ ; @@ -31,24 +35,23 @@ } our ($output_version, $quiet, $verbose, $stdin, @debug, -diff --git a/user-commands/xindy.in b/user-commands/xindy.in -index cfd399b..11c0009 100644 ---- a/user-commands/xindy.in -+++ b/user-commands/xindy.in -@@ -335,9 +335,9 @@ use File::Spec; +--- xindy.git.orig/user-commands/xindy.in ++++ xindy.git/user-commands/xindy.in +@@ -473,10 +473,9 @@ sub usage ( ;$ ) { - my $exit_code = shift; - $exit_code += 0; # turn undef into 0 -- print STDERR <<_EOT_ +- my $out = ( $exit_code ? *STDERR : *STDOUT ); +- print $out <<_EOT_ + my $signal_error = int shift; + my $output_handle = $signal_error ? *STDERR{IO} : *STDOUT{IO}; + print $output_handle <<_EOT_ usage: $cmd [-V?h] [-qv] [-d magic] [-o outfile.ind] [-t log] \\ [-L lang] [-C codepage] [-M module] [-I input] \\ -@@ -361,7 +361,7 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: +@@ -500,7 +499,7 @@ _EOT_ ;
