Hello community,
here is the log from the commit of package xindy for openSUSE:Factory
checked in at Wed Feb 2 02:16:55 CET 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/xindy/xindy.changes 2011-01-27 16:57:19.000000000 +0100
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 27 15:56:56 UTC 2011 - jengelh@medozas.de
+
+- Change RPM group to one of the known ones
+
+-------------------------------------------------------------------
+Mon Jun 7 14:46:31 UTC 2010 - jengelh@medozas.de
+
+- Initial package
+
calling whatdependson for head-i586
New:
----
fix-FHS.dpatch.diff
fix-alphabets-doc-geometry.dpatch.diff
fix-configure.dpatch.diff
fix-echo-expansion.dpatch.diff
fix-manpages.dpatch.diff
help-option.dpatch.diff
xindy-2.4~pre1.tar.xz
xindy.changes
xindy.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xindy.spec ++++++
#
# spec file for package xindy
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: xindy
Version: 2.3.99pre1
Release: 1
Group: Productivity/Text/Utilities
Summary: Index generator for structured documents like LaTeX or SGML
License: GPL2
Url: http://xindy.sf.net/
Source: xindy-2.4~pre1.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: clisp flex texlive-latex xz
Source1: fix-echo-expansion.dpatch.diff
Source2: fix-FHS.dpatch.diff
Source3: help-option.dpatch.diff
Source4: fix-manpages.dpatch.diff
Source5: fix-alphabets-doc-geometry.dpatch.diff
Source6: fix-configure.dpatch.diff
# Need this at runtime for indexing to work correctly:
Requires: clisp
Requires: xindy-rules = %version
%description
xindy is an index processor that can be used to generate book-like
indexes for arbitrary document-preparation systems. This includes
systems such as TeX and LaTeX, the roff-family, SGML/XML-based
systems (e.g. HTML) that process some kind of text and generate
indexing information. The kernel system is not fixed to any specific
system, but can be configured to work together with such systems.
In comparison to other index processors xindy has several powerful
features that make it an ideal framework for describing and
generating complex indices, addressing especially international
indexing.
%package rules
License: GPL2
Summary: Rule files for Xindy
Group: Productivity/Publishing/TeX
BuildArch: noarch
%description rules
xindy is an index processor that can be used to generate book-like
indexes for arbitrary document-preparation systems.
This package contains the rule files (the knowledge base) of xindy.
%package doc
License: GPL2
Summary: Documentation for Xindy
Group: Documentation/Other
BuildArch: noarch
%description doc
Documentation for the Xindy index generator.
%prep
%setup -qn %name-2.4-SNAPSHOT
for i in "%{S:1}" "%{S:2}" "%{S:3}" "%{S:4}" "%{S:5}" "%{S:6}"; do
# Debian at its best
patch -p1 -i "$i";
i="${i##*/}";
patch -p1 -i "debian/patches/${i%.diff}";
done;
%build
%configure --docdir=%_docdir/%name
# no -j
make;
%install
make install DESTDIR="%buildroot";
rm -f "%buildroot/%_prefix/VERSION";
%files
%defattr(-,root,root)
%_bindir/*
%_libdir/%name
%files rules
%defattr(-,root,root)
%_datadir/%name
%files doc
%defattr(-,root,root)
%doc %_mandir/*/*
%doc %_docdir/*
%changelog
++++++ fix-FHS.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/fix-FHS.dpatch
+++ xindy-2.4~pre1/debian/patches/fix-FHS.dpatch
@@ -0,0 +1,151 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-FHS.dpatch by Jörg Sommer
+##
+## DP: All files below /usr/lib/xindy/modules/ are architecture independent
+## DP: and therefor need to be below /usr/share/ as forced by the FHS.
+
+@DPATCH@
+diff -urNad xindy-2.2-beta2~/make-rules/alphabets/Makefile.in xindy-2.2-beta2/make-rules/alphabets/Makefile.in
+--- xindy-2.2-beta2~/make-rules/alphabets/Makefile.in 2006-04-18 01:29:21.443791000 +0200
++++ xindy-2.2-beta2/make-rules/alphabets/Makefile.in 2006-04-18 01:30:02.199791000 +0200
+@@ -251,7 +251,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-langdir = $(pkglibdir)/modules/lang
++langdir = $(pkgdatadir)/lang
+ albaniandir = $(langdir)/albanian
+ ALBANIAN = \
+ albanian/latin1-lang.xdy \
+diff -urNad xindy-2.2-beta2~/make-rules/inputenc/Makefile.in xindy-2.2-beta2/make-rules/inputenc/Makefile.in
+--- xindy-2.2-beta2~/make-rules/inputenc/Makefile.in 2006-04-18 01:29:21.447791000 +0200
++++ xindy-2.2-beta2/make-rules/inputenc/Makefile.in 2006-04-18 01:30:02.187791000 +0200
+@@ -155,7 +155,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-modulesdir = $(pkglibdir)/modules
++modulesdir = $(pkgdatadir)
+ inputencdir = $(modulesdir)/tex/inputenc
+ INPUTENCS = \
+ cp1250.xdy \
+diff -urNad xindy-2.2-beta2~/make-rules/styles/Makefile.in xindy-2.2-beta2/make-rules/styles/Makefile.in
+--- xindy-2.2-beta2~/make-rules/styles/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/make-rules/styles/Makefile.in 2006-04-18 01:30:02.191791000 +0200
+@@ -155,7 +155,7 @@
+ 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 \
+diff -urNad xindy-2.2-beta2~/modules/base/Makefile.in xindy-2.2-beta2/modules/base/Makefile.in
+--- xindy-2.2-beta2~/modules/base/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/base/Makefile.in 2006-04-18 01:30:02.183791000 +0200
+@@ -155,7 +155,7 @@
+ 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 \
+diff -urNad xindy-2.2-beta2~/modules/class/Makefile.in xindy-2.2-beta2/modules/class/Makefile.in
+--- xindy-2.2-beta2~/modules/class/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/class/Makefile.in 2006-04-18 01:30:02.179791000 +0200
+@@ -155,7 +155,7 @@
+ 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
+diff -urNad xindy-2.2-beta2~/modules/lang/german/Makefile.in xindy-2.2-beta2/modules/lang/german/Makefile.in
+--- xindy-2.2-beta2~/modules/lang/german/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/lang/german/Makefile.in 2006-04-18 01:30:02.179791000 +0200
+@@ -155,7 +155,7 @@
+ 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 \
+diff -urNad xindy-2.2-beta2~/modules/lang/latin/Makefile.in xindy-2.2-beta2/modules/lang/latin/Makefile.in
+--- xindy-2.2-beta2~/modules/lang/latin/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/lang/latin/Makefile.in 2006-04-18 01:30:02.183791000 +0200
+@@ -155,7 +155,7 @@
+ 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 \
+diff -urNad xindy-2.2-beta2~/modules/ord/Makefile.in xindy-2.2-beta2/modules/ord/Makefile.in
+--- xindy-2.2-beta2~/modules/ord/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/ord/Makefile.in 2006-04-18 01:30:02.187791000 +0200
+@@ -155,7 +155,7 @@
+ 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
+diff -urNad xindy-2.2-beta2~/modules/rules/Makefile.in xindy-2.2-beta2/modules/rules/Makefile.in
+--- xindy-2.2-beta2~/modules/rules/Makefile.in 2005-09-29 17:30:44.000000000 +0200
++++ xindy-2.2-beta2/modules/rules/Makefile.in 2006-04-18 01:30:02.175791000 +0200
+@@ -155,7 +155,7 @@
+ 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 \
+diff --git a/modules/styles/Makefile.in b/modules/styles/Makefile.in
+index 8942131..7de4a85 100644
+--- a/modules/styles/Makefile.in
++++ b/modules/styles/Makefile.in
+@@ -156,7 +156,7 @@ sbindir = @sbindir@
+ 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)
+diff --git a/user-commands/xindy.in b/user-commands/xindy.in
+index ce77027..bf5956c 100644
+--- a/user-commands/xindy.in
++++ b/user-commands/xindy.in
+@@ -309,11 +309,13 @@ BEGIN {
+ }
+
+ # modules directory
+- if ( -d "$cmd_dir/../modules" ) { # /opt style
+- $modules_dir = "$cmd_dir/../modules";
+- } elsif ( -d "$lib_dir/modules" ) { # /usr style
+- $modules_dir = "$lib_dir/modules";
+- } else {
++ $modules_dir = "/usr/share/xindy";
++ unless ( -d $modules_dir ) {
++ #if ( -d "$cmd_dir/../modules" ) { # /opt style
++ # $modules_dir = "$cmd_dir/../modules";
++ #} elsif ( -d "$lib_dir/modules" ) { # /usr style
++ # $modules_dir = "$lib_dir/modules";
++ #} else {
+ die "$cmd: Cannot locate xindy modules directory";
+ }
+ }
++++++ fix-alphabets-doc-geometry.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/fix-alphabets-doc-geometry.dpatch
+++ xindy-2.4~pre1/debian/patches/fix-alphabets-doc-geometry.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-alphabets-doc-geometry.dpatch © by Jörg Sommer
+##
+## DP: This document uses zero borders to put as much as possible on a page.
+## DP: But the border adjustment is not correct and the first page is greater
+## DP: than the page size.
+
+@DPATCH@
+
+diff --git a/make-rules/alphabets/alphabets-doc.tex b/make-rules/alphabets/alphabets-doc.tex
+index ce55690..b9bacfd 100644
+--- a/make-rules/alphabets/alphabets-doc.tex
++++ b/make-rules/alphabets/alphabets-doc.tex
+@@ -1,5 +1,5 @@
+ \documentclass{report}
+-\usepackage{a4wide}
++\usepackage[noheadfoot,margin=.5cm]{geometry}
+ \usepackage[TS1,LGR,T2A,T1]{fontenc}
+ \usepackage[colorlinks]{hyperref}
+ \usepackage[cp1252,latin1,cp850,latin2,cp1250,latin3,latin4,latin5,latin9,cp1251]{inputenc}
+@@ -15,9 +15,6 @@
+ \small (\^{}) & \small (\~{}) & \small (\r{}) & \small (\"{}) &
+ \small (,) & \small (\c{}) & \small (k{}) & \small (\.{}) &
+ \small (-) & \small (\={}) & \small (?)\\}{\end{tabular}}
+-\setlength{\topskip}{0mm}
+-\setlength{\topmargin}{-15mm}
+-\setlength{\textheight}{260mm}
+ \setcounter{tocdepth}{2}
+
+ \renewcommand*{\contentsname}{\begin{center}
++++++ fix-configure.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/fix-configure.dpatch
+++ xindy-2.4~pre1/debian/patches/fix-configure.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-configure.dpatch by Jörg Sommer
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The grouping of the check for latex and pdflatex is not correct,
+## DP: which causes configure failes with --disable-make-rules and
+## DP: --disable-docs. This patch is only a ugly workaround. A better
+## DP: patch was send upstream.
+
+@DPATCH@
+
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -2286,7 +2286,7 @@ else
+ BUILDRULES=yes
+ fi
+
+-test "$BUILDRULES" = "yes" &&
++test "$BUILDRULES" = "yes" && {
+ for ac_prog in latex elatex lambda
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2337,7 +2337,7 @@ then
+ $as_echo "$as_me: error: Unable to find a LaTeX application" >&2;}
+ { (exit 1); exit 1; }; };
+ fi
+-
++}
+
+ if test "$BUILDRULES" = "yes"; then
+ BUILDRULES_TRUE=
+@@ -2356,7 +2356,7 @@ else
+ BUILDDOCS=yes
+ fi
+
+-test "$BUILDDOCS" = "yes" &&
++test "$BUILDDOCS" = "yes" && {
+ for ac_prog in pdflatex
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -2407,7 +2407,7 @@ then
+ $as_echo "$as_me: error: Unable to find a PDFLaTeX application" >&2;}
+ { (exit 1); exit 1; }; };
+ fi
+-
++}
+
+ if test "$BUILDDOCS" = "yes"; then
+ BUILDDOCS_TRUE=
++++++ fix-echo-expansion.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/fix-echo-expansion.dpatch
+++ xindy-2.4~pre1/debian/patches/fix-echo-expansion.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## echo-expansion-fix.dpatch by Jörg Sommer
+##
+## DP: The echo command shipped with the Debian system takes \ as an escape
+## DP: sequence. This causes a formfeed is printed in the string "\fenc...".
+
+@DPATCH@
+diff -urNad xindy-2.2-beta2~/make-rules/alphabets/Makefile.in xindy-2.2-beta2/make-rules/alphabets/Makefile.in
+--- xindy-2.2-beta2~/make-rules/alphabets/Makefile.in 2006-04-13 17:23:13.186672000 +0200
++++ xindy-2.2-beta2/make-rules/alphabets/Makefile.in 2006-04-13 17:24:38.442672000 +0200
+@@ -2438,7 +2438,7 @@
+ echo "\section{Codepage latin9}" >>$@
+ for i in $(DOCS_LATIN9); do echo "\input{$$i}" >>$@; done
+ echo "\ienc{cp1251}" >>$@
+- echo "\fenc{T2A}" >>$@
++ printf "%s\n" "\fenc{T2A}" >>$@
+ echo "\chapter{Cyrillic scripts}" >>$@
+ echo "\section{Codepage 1251}" >>$@
+ for i in $(DOCS_CYR_1251); do echo "\input{$$i}" >>$@; done
++++++ fix-manpages.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/fix-manpages.dpatch
+++ xindy-2.4~pre1/debian/patches/fix-manpages.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-manpages.dpatch by Jörg Sommer
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The manpage xindy.v2.1 uses an invalid section; 1L istead of 1
+
+@DPATCH@
+
+diff --git a/user-commands/xindy.v2.1 b/user-commands/xindy.v2.1
+index 0afda89..3a33ac6 100644
+--- a/user-commands/xindy.v2.1
++++ b/user-commands/xindy.v2.1
+@@ -1,6 +1,6 @@
+ .\" Copyright (c) 1996,1997 Roger Kehr
+ .\" See section COPYING for conditions for redistribution
+-.TH xindy 1L "February 1997" "Roger Kehr" ""
++.TH xindy 1 "February 1997" "Roger Kehr" ""
+ .de BP
+ .sp
+ .ti \-.2i
++++++ help-option.dpatch.diff ++++++
--- xindy-2.4~pre1.orig/debian/patches/help-option.dpatch
+++ xindy-2.4~pre1/debian/patches/help-option.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## help-option.dpatch by Jörg Sommer
+##
+## DP: The commandline option --help of xindy and texindy prints the help
+## DP: message to stderr.
+
+@DPATCH@
+diff --git a/user-commands/texindy b/user-commands/texindy
+index e29e4e1..06dff2b 100755
+--- a/user-commands/texindy
++++ b/user-commands/texindy
+@@ -322,9 +322,9 @@ use Getopt::Long qw(:config bundling);
+
+ sub usage ( ;$ )
+ {
+- my $exit_code = shift;
+- $exit_code += 0; # turn undef into 0
+- print STDERR <<_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:
+
+ _EOT_
+ ;
+- exit ($exit_code);
++ exit ($signal_error ? 1 : 0);
+ }
+
+ 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;
+
+ sub usage ( ;$ )
+ {
+- my $exit_code = shift;
+- $exit_code += 0; # turn undef into 0
+- print STDERR <<_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:
+
+ _EOT_
+ ;
+- exit ($exit_code);
++ exit ($signal_error ? 1 : 0);
+ }
+
+ our ($quiet, $verbose, %debug,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org