- updated to 0.20.1 (note: this version drops support for gettextize --intl)

- updated info,libdir patches
- removed outdated libintl_by_gcj,perlre,java patches

diff --git a/gettext-info.patch b/gettext-info.patch
index 17c1f63465e3d9a96d3410cd57c8432525dfba54..dbe94a8da6e30a761a07a2bbc457ccb8ba46894f 100644 (file)
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,5 +1,5 @@
---- gettext-0.19.7/gettext-tools/doc/gettext.texi.orig 2015-12-08 13:50:04.000000000 +0100
-+++ gettext-0.19.7/gettext-tools/doc/gettext.texi      2015-12-28 17:03:46.406266256 +0100
+--- gettext-0.20.1/gettext-tools/doc/gettext.texi.orig 2019-05-11 23:41:25.000000000 +0200
++++ gettext-0.20.1/gettext-tools/doc/gettext.texi      2019-06-18 17:43:19.826330748 +0200

 @@ -47,30 +47,30 @@
  @include version.texi
  
 @@ -47,30 +47,30 @@
  @include version.texi
  


@@ -54,7 +54,7 @@
  @end direntry
  @end ifinfo
  
  @end direntry
  @end ifinfo
  

-@@ -214,16 +214,16 @@
+@@ -216,16 +216,16 @@

  
  Making the PO Template File
  
  
  Making the PO Template File
  


@@ -74,7 +74,7 @@
  
  Editing PO Files
  
  
  Editing PO Files
  

-@@ -255,16 +255,16 @@
+@@ -257,16 +257,16 @@

  
  Manipulating PO Files
  
  
  Manipulating PO Files
  


@@ -99,9 +99,9 @@
 +* msgen::                       Invoking the @code{msgen} Program
 +* msgexec::                     Invoking the @code{msgexec} Program
  * Colorizing::                  Highlighting parts of PO files
 +* msgen::                       Invoking the @code{msgen} Program
 +* msgexec::                     Invoking the @code{msgexec} Program
  * Colorizing::                  Highlighting parts of PO files

+ * Other tools::                 Other tools for manipulating PO files

  * libgettextpo::                Writing your own programs that process PO files
  * libgettextpo::                Writing your own programs that process PO files

- 
-@@ -278,8 +278,8 @@
+@@ -281,8 +281,8 @@

  
  Producing Binary MO Files
  
  
  Producing Binary MO Files
  


@@ -112,7 +112,7 @@
  * MO Files::                    The Format of GNU MO Files
  
  The Programmer's View
  * MO Files::                    The Format of GNU MO Files
  
  The Programmer's View

-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@

  
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works
  
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works


@@ -121,7 +121,7 @@
  * Adjusting Files::             Files You Must Create or Alter
  * autoconf macros::             Autoconf macros for use in @file{configure.ac}
  * Version Control Issues::      
  * Adjusting Files::             Files You Must Create or Alter
  * autoconf macros::             Autoconf macros for use in @file{configure.ac}
  * Version Control Issues::      

-@@ -375,7 +375,7 @@
+@@ -376,7 +376,7 @@

  * Distributed Development::     Avoiding version mismatch in distributed development
  * Files under Version Control::  Files to put under version control
  * Translations under Version Control::  Put PO Files under Version Control
  * Distributed Development::     Avoiding version mismatch in distributed development
  * Files under Version Control::  Files to put under version control
  * Translations under Version Control::  Put PO Files under Version Control


@@ -130,7 +130,7 @@
  
  Other Programming Languages
  
  
  Other Programming Languages
  

-@@ -446,10 +446,10 @@
+@@ -446,12 +446,12 @@

  * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
  * gettext.sh::                  Contents of @code{gettext.sh}
  * gettext Invocation::          Invoking the @code{gettext} program
  * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
  * gettext.sh::                  Contents of @code{gettext.sh}
  * gettext Invocation::          Invoking the @code{gettext} program


@@ -138,14 +138,18 @@
 -* envsubst Invocation::         Invoking the @code{envsubst} program
 -* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
 -* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function
 -* envsubst Invocation::         Invoking the @code{envsubst} program
 -* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
 -* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function

+-* eval_pgettext Invocation::    Invoking the @code{eval_pgettext} function
+-* eval_npgettext Invocation::   Invoking the @code{eval_npgettext} function

 +* ngettext::                    Invoking the @code{ngettext} program
 +* envsubst::                    Invoking the @code{envsubst} program
 +* eval_gettext::                Invoking the @code{eval_gettext} function
 +* eval_ngettext::               Invoking the @code{eval_ngettext} function
 +* ngettext::                    Invoking the @code{ngettext} program
 +* envsubst::                    Invoking the @code{envsubst} program
 +* eval_gettext::                Invoking the @code{eval_gettext} function
 +* eval_ngettext::               Invoking the @code{eval_ngettext} function

++* eval_pgettext::               Invoking the @code{eval_pgettext} function
++* eval_npgettext::              Invoking the @code{eval_npgettext} function

  
  Perl
  
  
  Perl
  

-@@ -998,7 +998,7 @@
+@@ -1027,7 +1027,7 @@

  exactly where in C sources each string is used.  All translations
  are set to empty.  The letter @code{t} in @file{.pot} marks this as
  a Template PO file, not yet oriented towards any particular language.
  exactly where in C sources each string is used.  All translations
  are set to empty.  The letter @code{t} in @file{.pot} marks this as
  a Template PO file, not yet oriented towards any particular language.


@@ -154,7 +158,7 @@
  @code{xgettext} program.  If you are @emph{really} lazy, you might
  be interested at working a lot more right away, and preparing the
  whole distribution setup (@pxref{Maintainers}).  By doing so, you
  @code{xgettext} program.  If you are @emph{really} lazy, you might
  be interested at working a lot more right away, and preparing the
  whole distribution setup (@pxref{Maintainers}).  By doing so, you

-@@ -1073,7 +1073,7 @@
+@@ -1102,7 +1102,7 @@

  which are no longer used in the program sources (@pxref{Obsolete
  Entries}).  It finally discovers new strings and inserts them in
  the resulting PO file as untranslated entries (@pxref{Untranslated
  which are no longer used in the program sources (@pxref{Obsolete
  Entries}).  It finally discovers new strings and inserts them in
  the resulting PO file as untranslated entries (@pxref{Untranslated


@@ -163,7 +167,7 @@
  @code{msgmerge} really does.
  
  Whatever route or means taken, the goal is to obtain an updated
  @code{msgmerge} really does.
  
  Whatever route or means taken, the goal is to obtain an updated

-@@ -1097,8 +1097,8 @@
+@@ -1126,8 +1126,8 @@

  Once the PO file is complete and dependable, the @code{msgfmt} program
  is used for turning the PO file into a machine-oriented format, which
  may yield efficient retrieval of translations by the programs of the
  Once the PO file is complete and dependable, the @code{msgfmt} program
  is used for turning the PO file into a machine-oriented format, which
  may yield efficient retrieval of translations by the programs of the


@@ -174,7 +178,7 @@
  for the @code{msgfmt} program.
  
  Finally, the modified and marked C sources are compiled and linked
  for the @code{msgfmt} program.
  
  Finally, the modified and marked C sources are compiled and linked

-@@ -1493,7 +1493,7 @@
+@@ -1555,7 +1555,7 @@

  
  When the @code{c-format} flag is given for a string the @code{msgfmt}
  program does some more tests to check the validity of the translation.
  
  When the @code{c-format} flag is given for a string the @code{msgfmt}
  program does some more tests to check the validity of the translation.


@@ -183,7 +187,7 @@
  
  @item objc-format
  @kwindex objc-format@r{ flag}
  
  @item objc-format
  @kwindex objc-format@r{ flag}

-@@ -2535,7 +2535,7 @@
+@@ -2641,7 +2641,7 @@

  
  If a string is marked with @code{c-format} and this is not correct the
  user can find out who is responsible for the decision.  See
  
  If a string is marked with @code{c-format} and this is not correct the
  user can find out who is responsible for the decision.  See


@@ -191,8 +195,8 @@
 +@ref{xgettext} to see how the @code{--debug} option can be
  used for solving this problem.
  
 +@ref{xgettext} to see how the @code{--debug} option can be
  used for solving this problem.
  

- @node Special cases, Bug Report Address, c-format Flag, Sources
-@@ -2567,7 +2567,7 @@
+ @node Special cases
+@@ -2673,7 +2673,7 @@

  While it is no problem to mark the string @code{"a default message"} it
  is not possible to mark the string initializers for @code{messages}.
  What is to be done?  We have to fulfill two tasks.  First we have to mark the
  While it is no problem to mark the string @code{"a default message"} it
  is not possible to mark the string initializers for @code{messages}.
  What is to be done?  We have to fulfill two tasks.  First we have to mark the


@@ -201,7 +205,7 @@
  can find them, and second we have to translate the string at runtime
  before printing them.
  
  can find them, and second we have to translate the string at runtime
  before printing them.
  

-@@ -2597,8 +2597,7 @@
+@@ -2703,8 +2703,7 @@

  
  Please convince yourself that the string which is written by
  @code{fputs} is translated in any case.  How to get @code{xgettext} know
  
  Please convince yourself that the string which is written by
  @code{fputs} is translated in any case.  How to get @code{xgettext} know


@@ -211,7 +215,7 @@
  
  The above is of course not the only solution.  You could also come along
  with the following one:
  
  The above is of course not the only solution.  You could also come along
  with the following one:

-@@ -2894,10 +2893,10 @@
+@@ -3000,10 +2999,10 @@

  @c FIXME: Rewrite.
  
  @menu
  @c FIXME: Rewrite.
  
  @menu


@@ -219,12 +223,12 @@
 +* xgettext::                    Invoking the @code{xgettext} Program
  @end menu
  
 +* xgettext::                    Invoking the @code{xgettext} Program
  @end menu
  

--@node xgettext Invocation,  , Template, Template
-+@node xgettext,  , Template, Template
+-@node xgettext Invocation
++@node xgettext

  @section Invoking the @code{xgettext} Program
  
  @include xgettext.texi
  @section Invoking the @code{xgettext} Program
  
  @include xgettext.texi

-@@ -2926,16 +2925,16 @@
+@@ -3032,11 +3031,11 @@

  the header entry of this file.
  
  @menu
  the header entry of this file.
  
  @menu


@@ -233,18 +237,12 @@
  * Header Entry::                Filling in the Header Entry
  @end menu
  
  * Header Entry::                Filling in the Header Entry
  @end menu
  

--@node msginit Invocation, Header Entry, Creating, Creating
-+@node msginit, Header Entry, Creating, Creating
+-@node msginit Invocation
++@node msginit

  @section Invoking the @code{msginit} Program
  
  @include msginit.texi
  @section Invoking the @code{msginit} Program
  
  @include msginit.texi

- 
--@node Header Entry,  , msginit Invocation, Creating
-+@node Header Entry,  , msginit, Creating
- @section Filling in the Header Entry
- @cindex header entry of a PO file
- 
-@@ -3162,10 +3161,10 @@
+@@ -3268,10 +3267,10 @@

  @chapter Updating Existing PO Files
  
  @menu
  @chapter Updating Existing PO Files
  
  @menu


@@ -252,12 +250,12 @@
 +* msgmerge::                    Invoking the @code{msgmerge} Program
  @end menu
  
 +* msgmerge::                    Invoking the @code{msgmerge} Program
  @end menu
  

--@node msgmerge Invocation,  , Updating, Updating
-+@node msgmerge,  , Updating, Updating
+-@node msgmerge Invocation
++@node msgmerge

  @section Invoking the @code{msgmerge} Program
  
  @include msgmerge.texi
  @section Invoking the @code{msgmerge} Program
  
  @include msgmerge.texi

-@@ -4705,71 +4704,71 @@
+@@ -4811,67 +4810,67 @@

  write other specialized programs that process PO files.
  
  @menu
  write other specialized programs that process PO files.
  
  @menu


@@ -282,75 +280,70 @@
 +* msgen::                       Invoking the @code{msgen} Program
 +* msgexec::                     Invoking the @code{msgexec} Program
  * Colorizing::                  Highlighting parts of PO files
 +* msgen::                       Invoking the @code{msgen} Program
 +* msgexec::                     Invoking the @code{msgexec} Program
  * Colorizing::                  Highlighting parts of PO files

+ * Other tools::                 Other tools for manipulating PO files

  * libgettextpo::                Writing your own programs that process PO files
  @end menu
  
  * libgettextpo::                Writing your own programs that process PO files
  @end menu
  

--@node msgcat Invocation, msgconv Invocation, Manipulating, Manipulating
-+@node msgcat, msgconv, Manipulating, Manipulating
+-@node msgcat Invocation
++@node msgcat

  @section Invoking the @code{msgcat} Program
  
  @include msgcat.texi
  
  @section Invoking the @code{msgcat} Program
  
  @include msgcat.texi
  

--@node msgconv Invocation, msggrep Invocation, msgcat Invocation, Manipulating
-+@node msgconv, msggrep, msgcat, Manipulating
+-@node msgconv Invocation
++@node msgconv

  @section Invoking the @code{msgconv} Program
  
  @include msgconv.texi
  
  @section Invoking the @code{msgconv} Program
  
  @include msgconv.texi
  

--@node msggrep Invocation, msgfilter Invocation, msgconv Invocation, Manipulating
-+@node msggrep, msgfilter, msgconv, Manipulating
+-@node msggrep Invocation
++@node msggrep

  @section Invoking the @code{msggrep} Program
  
  @include msggrep.texi
  
  @section Invoking the @code{msggrep} Program
  
  @include msggrep.texi
  

--@node msgfilter Invocation, msguniq Invocation, msggrep Invocation, Manipulating
-+@node msgfilter, msguniq, msggrep, Manipulating
+-@node msgfilter Invocation
++@node msgfilter

  @section Invoking the @code{msgfilter} Program
  
  @include msgfilter.texi
  
  @section Invoking the @code{msgfilter} Program
  
  @include msgfilter.texi
  

--@node msguniq Invocation, msgcomm Invocation, msgfilter Invocation, Manipulating
-+@node msguniq, msgcomm, msgfilter, Manipulating
+-@node msguniq Invocation
++@node msguniq

  @section Invoking the @code{msguniq} Program
  
  @include msguniq.texi
  
  @section Invoking the @code{msguniq} Program
  
  @include msguniq.texi
  

--@node msgcomm Invocation, msgcmp Invocation, msguniq Invocation, Manipulating
-+@node msgcomm, msgcmp, msguniq, Manipulating
+-@node msgcomm Invocation
++@node msgcomm

  @section Invoking the @code{msgcomm} Program
  
  @include msgcomm.texi
  
  @section Invoking the @code{msgcomm} Program
  
  @include msgcomm.texi
  

--@node msgcmp Invocation, msgattrib Invocation, msgcomm Invocation, Manipulating
-+@node msgcmp, msgattrib, msgcomm, Manipulating
+-@node msgcmp Invocation
++@node msgcmp

  @section Invoking the @code{msgcmp} Program
  
  @include msgcmp.texi
  
  @section Invoking the @code{msgcmp} Program
  
  @include msgcmp.texi
  

--@node msgattrib Invocation, msgen Invocation, msgcmp Invocation, Manipulating
-+@node msgattrib, msgen, msgcmp, Manipulating
+-@node msgattrib Invocation
++@node msgattrib

  @section Invoking the @code{msgattrib} Program
  
  @include msgattrib.texi
  
  @section Invoking the @code{msgattrib} Program
  
  @include msgattrib.texi
  

--@node msgen Invocation, msgexec Invocation, msgattrib Invocation, Manipulating
-+@node msgen, msgexec, msgattrib, Manipulating
+-@node msgen Invocation
++@node msgen

  @section Invoking the @code{msgen} Program
  
  @include msgen.texi
  
  @section Invoking the @code{msgen} Program
  
  @include msgen.texi
  

--@node msgexec Invocation, Colorizing, msgen Invocation, Manipulating
-+@node msgexec, Colorizing, msgen, Manipulating
+-@node msgexec Invocation
++@node msgexec

  @section Invoking the @code{msgexec} Program
  
  @include msgexec.texi
  @section Invoking the @code{msgexec} Program
  
  @include msgexec.texi

- 
--@node Colorizing, libgettextpo, msgexec Invocation, Manipulating
-+@node Colorizing, libgettextpo, msgexec, Manipulating
- @section Highlighting parts of PO files
- 
- Translators are usually only interested in seeing the untranslated and
-@@ -5299,22 +5298,22 @@
+@@ -5436,17 +5435,17 @@

  @c FIXME: Rewrite.
  
  @menu
  @c FIXME: Rewrite.
  
  @menu


@@ -361,24 +354,18 @@
  * MO Files::                    The Format of GNU MO Files
  @end menu
  
  * MO Files::                    The Format of GNU MO Files
  @end menu
  

--@node msgfmt Invocation, msgunfmt Invocation, Binaries, Binaries
-+@node msgfmt, msgunfmt, Binaries, Binaries
+-@node msgfmt Invocation
++@node msgfmt 

  @section Invoking the @code{msgfmt} Program
  
  @include msgfmt.texi
  
  @section Invoking the @code{msgfmt} Program
  
  @include msgfmt.texi
  

--@node msgunfmt Invocation, MO Files, msgfmt Invocation, Binaries
-+@node msgunfmt, MO Files, msgfmt, Binaries
+-@node msgunfmt Invocation
++@node msgunfmt

  @section Invoking the @code{msgunfmt} Program
  
  @include msgunfmt.texi
  @section Invoking the @code{msgunfmt} Program
  
  @include msgunfmt.texi

- 
--@node MO Files,  , msgunfmt Invocation, Binaries
-+@node MO Files,  , msgunfmt, Binaries
- @section The Format of GNU MO Files
- @cindex MO file's format
- @cindex file format, @file{.mo}
-@@ -6228,7 +6227,7 @@
+@@ -6365,7 +6364,7 @@

  The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a
  comprehensive set of plural forms in a different format.  The
  @code{msginit} program has preliminary support for the format so you can
  The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a
  comprehensive set of plural forms in a different format.  The
  @code{msginit} program has preliminary support for the format so you can


@@ -387,7 +374,7 @@
  
  @table @asis
  @item Only one form:
  
  @table @asis
  @item Only one form:

-@@ -7581,7 +7580,7 @@
+@@ -7719,7 +7718,7 @@

  @menu
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works
  @menu
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works


@@ -396,40 +383,25 @@
  * Adjusting Files::             Files You Must Create or Alter
  * autoconf macros::             Autoconf macros for use in @file{configure.ac}
  * Version Control Issues::      
  * Adjusting Files::             Files You Must Create or Alter
  * autoconf macros::             Autoconf macros for use in @file{configure.ac}
  * Version Control Issues::      

-@@ -7614,7 +7613,7 @@
- described in the remaining of this chapter.  Some maintainers might
- use this as an opportunity to unflatten their package structure.
- 
--@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers
-+@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers
- @section Prerequisite Works
- @cindex converting a package to use @code{gettext}
- @cindex migration from earlier versions of @code{gettext}
-@@ -7699,12 +7698,12 @@
+@@ -7836,7 +7835,7 @@

  a maintainer, ever think there is a real problem with a team, please
  never try to @emph{solve} a team's problem on your own.
  
  a maintainer, ever think there is a real problem with a team, please
  never try to @emph{solve} a team's problem on your own.
  

--@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers
-+@node gettextize, Adjusting Files, Prerequisites, Maintainers
+-@node gettextize Invocation
++@node gettextize

  @section Invoking the @code{gettextize} Program
  
  @include gettextize.texi
  @section Invoking the @code{gettextize} Program
  
  @include gettextize.texi

- 
--@node Adjusting Files, autoconf macros, gettextize Invocation, Maintainers
-+@node Adjusting Files, autoconf macros, gettextize, Maintainers
- @section Files You Must Create or Alter
- @cindex @code{gettext} files
- 
-@@ -7866,7 +7865,7 @@
+@@ -8002,7 +8001,7 @@

  Similarly, you can create rules for building message catalogs for the
  @file{sr@@latin} locale -- Serbian written with the Latin alphabet --
  from those for the @file{sr} locale -- Serbian written with Cyrillic
 -letters.  See @ref{msgfilter Invocation}.
 +letters.  See @ref{msgfilter}.
  
  Similarly, you can create rules for building message catalogs for the
  @file{sr@@latin} locale -- Serbian written with the Latin alphabet --
  from those for the @file{sr} locale -- Serbian written with Cyrillic
 -letters.  See @ref{msgfilter Invocation}.
 +letters.  See @ref{msgfilter}.
  

- @node configure.ac, config.guess, po/Rules-*, Adjusting Files
+ @node configure.ac

  @subsection @file{configure.ac} at top level
  @subsection @file{configure.ac} at top level

-@@ -8610,7 +8609,7 @@
+@@ -8615,7 +8614,7 @@

  to instruct @code{xgettext} to mark all translatable strings in @samp{gettext}
  invocations that occur as fifth argument to this function as @samp{c-format}.
  
  to instruct @code{xgettext} to mark all translatable strings in @samp{gettext}
  invocations that occur as fifth argument to this function as @samp{c-format}.
  


@@ -438,7 +410,7 @@
  accepts.
  
  The use of this macro is an alternative to the use of the
  accepts.
  
  The use of this macro is an alternative to the use of the

-@@ -8680,7 +8679,7 @@
+@@ -8685,7 +8684,7 @@

  * Distributed Development::     Avoiding version mismatch in distributed development
  * Files under Version Control::  Files to put under version control
  * Translations under Version Control::  Put PO Files under Version Control
  * Distributed Development::     Avoiding version mismatch in distributed development
  * Files under Version Control::  Files to put under version control
  * Translations under Version Control::  Put PO Files under Version Control


@@ -446,26 +418,17 @@
 +* autopoint::                   Invoking the @code{autopoint} Program
  @end menu
  
 +* autopoint::                   Invoking the @code{autopoint} Program
  @end menu
  

- @node Distributed Development, Files under Version Control, Version Control Issues, Version Control Issues
-@@ -8802,7 +8801,7 @@
- use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
- installed.
- 
--@node Translations under Version Control, autopoint Invocation, Files under Version Control, Version Control Issues
-+@node Translations under Version Control, autopoint, Files under Version Control, Version Control Issues
- @subsection Put PO Files under Version Control
- 
- Since translations are valuable assets as well as the source code, it
-@@ -8851,7 +8850,7 @@
+ @node Distributed Development
+@@ -8856,7 +8855,7 @@

  
  @end itemize
  
  
  @end itemize
  

--@node autopoint Invocation,  , Translations under Version Control, Version Control Issues
-+@node autopoint,  , Translations under Version Control, Version Control Issues
+-@node autopoint Invocation
++@node autopoint

  @subsection Invoking the @code{autopoint} Program
  
  @include autopoint.texi
  @subsection Invoking the @code{autopoint} Program
  
  @include autopoint.texi

-@@ -9595,10 +9594,10 @@
+@@ -9592,12 +9591,12 @@

  * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
  * gettext.sh::                  Contents of @code{gettext.sh}
  * gettext Invocation::          Invoking the @code{gettext} program
  * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
  * gettext.sh::                  Contents of @code{gettext.sh}
  * gettext Invocation::          Invoking the @code{gettext} program


@@ -473,25 +436,33 @@
 -* envsubst Invocation::         Invoking the @code{envsubst} program
 -* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
 -* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function
 -* envsubst Invocation::         Invoking the @code{envsubst} program
 -* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
 -* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function

+-* eval_pgettext Invocation::    Invoking the @code{eval_pgettext} function
+-* eval_npgettext Invocation::   Invoking the @code{eval_npgettext} function

 +* ngettext::                    Invoking the @code{ngettext} program
 +* envsubst::                    Invoking the @code{envsubst} program
 +* eval_gettext::                Invoking the @code{eval_gettext} function
 +* eval_ngettext::               Invoking the @code{eval_ngettext} function
 +* ngettext::                    Invoking the @code{ngettext} program
 +* envsubst::                    Invoking the @code{envsubst} program
 +* eval_gettext::                Invoking the @code{eval_gettext} function
 +* eval_ngettext::               Invoking the @code{eval_ngettext} function

++* eval_pgettext::               Invoking the @code{eval_pgettext} function
++* eval_npgettext::              Invoking the @code{eval_npgettext} function

  @end menu
  
  @end menu
  

- @node Preparing Shell Scripts, gettext.sh, sh, sh
-@@ -9619,8 +9618,8 @@
+ @node Preparing Shell Scripts
+@@ -9618,10 +9617,10 @@

  
  near the top of the script.  @code{gettext.sh} is a shell function library
  that provides the functions
  
  near the top of the script.  @code{gettext.sh} is a shell function library
  that provides the functions

--@code{eval_gettext} (see @ref{eval_gettext Invocation}) and
--@code{eval_ngettext} (see @ref{eval_ngettext Invocation}).
-+@code{eval_gettext} (see @ref{eval_gettext}) and
-+@code{eval_ngettext} (see @ref{eval_ngettext}).
+-@code{eval_gettext} (see @ref{eval_gettext Invocation}),
+-@code{eval_ngettext} (see @ref{eval_ngettext Invocation}),
+-@code{eval_pgettext} (see @ref{eval_pgettext Invocation}), and
+-@code{eval_npgettext} (see @ref{eval_npgettext Invocation}).
++@code{eval_gettext} (see @ref{eval_gettext}),
++@code{eval_ngettext} (see @ref{eval_ngettext}),
++@code{eval_pgettext} (see @ref{eval_pgettext}), and
++@code{eval_npgettext} (see @ref{eval_npgettext}).

  You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
  
  @item
  You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
  
  @item

-@@ -9730,13 +9729,13 @@
+@@ -9731,16 +9730,16 @@

  and a newline, without interpreting backslashes in the argument string.
  
  @item eval_gettext
  and a newline, without interpreting backslashes in the argument string.
  
  @item eval_gettext


@@ -501,47 +472,69 @@
  @item eval_ngettext
 -See @ref{eval_ngettext Invocation}.
 +See @ref{eval_ngettext}.
  @item eval_ngettext
 -See @ref{eval_ngettext Invocation}.
 +See @ref{eval_ngettext}.

- @end itemize

  
  

--@node gettext Invocation, ngettext Invocation, gettext.sh, sh
-+@node gettext Invocation, ngettext, gettext.sh, sh
- @subsubsection Invoking the @code{gettext} program
+ @item eval_pgettext
+-See @ref{eval_pgettext Invocation}.
++See @ref{eval_pgettext}.

  
  

- @include rt-gettext.texi
-@@ -9745,7 +9744,7 @@
+ @item eval_npgettext
+-See @ref{eval_npgettext Invocation}.
++See @ref{eval_npgettext}.
+ @end itemize
+ 
+ @node gettext Invocation
+@@ -9752,7 +9751,7 @@

  @code{gettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  
  @code{gettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  

--@node ngettext Invocation, envsubst Invocation, gettext Invocation, sh
-+@node ngettext, envsubst, gettext Invocation, sh
+-@node ngettext Invocation
++@node ngettext

  @subsubsection Invoking the @code{ngettext} program
  
  @include rt-ngettext.texi
  @subsubsection Invoking the @code{ngettext} program
  
  @include rt-ngettext.texi

-@@ -9754,12 +9753,12 @@
+@@ -9761,12 +9760,12 @@

  @code{ngettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  
  @code{ngettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  

--@node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh
-+@node envsubst, eval_gettext, ngettext, sh
+-@node envsubst Invocation
++@node envsubst

  @subsubsection Invoking the @code{envsubst} program
  
  @include rt-envsubst.texi
  
  @subsubsection Invoking the @code{envsubst} program
  
  @include rt-envsubst.texi
  

--@node eval_gettext Invocation, eval_ngettext Invocation, envsubst Invocation, sh
-+@node eval_gettext, eval_ngettext, envsubst, sh
+-@node eval_gettext Invocation
++@node eval_gettext

  @subsubsection Invoking the @code{eval_gettext} function
  
  @cindex @code{eval_gettext} function, usage
  @subsubsection Invoking the @code{eval_gettext} function
  
  @cindex @code{eval_gettext} function, usage

-@@ -9772,7 +9771,7 @@
+@@ -9779,7 +9778,7 @@

  performing dollar-substitution on the result.  Note that only shell variables
  mentioned in @var{msgid} will be dollar-substituted in the result.
  
  performing dollar-substitution on the result.  Note that only shell variables
  mentioned in @var{msgid} will be dollar-substituted in the result.
  

--@node eval_ngettext Invocation,  , eval_gettext Invocation, sh
-+@node eval_ngettext,  , eval_gettext, sh
+-@node eval_ngettext Invocation
++@node eval_ngettext

  @subsubsection Invoking the @code{eval_ngettext} function
  
  @cindex @code{eval_ngettext} function, usage
  @subsubsection Invoking the @code{eval_ngettext} function
  
  @cindex @code{eval_ngettext} function, usage

-@@ -12385,7 +12384,7 @@
+@@ -9793,7 +9792,7 @@
+ on the result.  Note that only shell variables mentioned in @var{msgid} or
+ @var{msgid-plural} will be dollar-substituted in the result.
+ 
+-@node eval_pgettext Invocation
++@node eval_pgettext
+ @subsubsection Invoking the @code{eval_pgettext} function
+ 
+ @cindex @code{eval_pgettext} function, usage
+@@ -9807,7 +9806,7 @@
+ dollar-substitution on the result.  Note that only shell variables mentioned
+ in @var{msgid} will be dollar-substituted in the result.
+ 
+-@node eval_npgettext Invocation
++@node eval_npgettext
+ @subsubsection Invoking the @code{eval_npgettext} function
+ 
+ @cindex @code{eval_npgettext} function, usage
+@@ -12564,7 +12563,7 @@

  Special Characters} data category can be used.
  
  To merge the translations, the @samp{msgfmt} program can be used with
  Special Characters} data category can be used.
  
  To merge the translations, the @samp{msgfmt} program can be used with


@@ -550,6 +543,15 @@
  about how one calls the @samp{msgfmt} program.  @samp{msgfmt}'s
  @code{--xml} option doesn't perform character escaping, so translated
  strings can have arbitrary XML constructs, such as elements for markup.
  about how one calls the @samp{msgfmt} program.  @samp{msgfmt}'s
  @code{--xml} option doesn't perform character escaping, so translated
  strings can have arbitrary XML constructs, such as elements for markup.

+@@ -12734,7 +12733,7 @@
+ @subsection XML files
+ 
+ See the section @ref{Preparing ITS Rules} and
+-@ref{msgfmt Invocation}, subsection ``XML mode operations''.
++@ref{msgfmt}, subsection ``XML mode operations''.
+ 
+ @node Conclusion
+ @chapter Concluding Remarks

 --- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig      2003-05-05 11:09:21.000000000 +0200
 +++ gettext-0.12.1/gettext-tools/doc/gettextize.texi   2003-06-07 20:10:53.000000000 +0200
 @@ -177,4 +177,4 @@
 --- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig      2003-05-05 11:09:21.000000000 +0200
 +++ gettext-0.12.1/gettext-tools/doc/gettextize.texi   2003-06-07 20:10:53.000000000 +0200
 @@ -177,4 +177,4 @@


@@ -572,3 +574,17 @@
  @end direntry
  @end ifinfo
  
  @end direntry
  @end ifinfo
  

+--- gettext-0.20.1/libtextstyle/doc/libtextstyle.texi.orig     2019-05-05 18:38:05.000000000 +0200
++++ gettext-0.20.1/libtextstyle/doc/libtextstyle.texi  2019-06-19 07:51:38.487255700 +0200
+@@ -26,9 +26,9 @@
+ @include version.texi
+ 
+ @ifinfo
+-@dircategory Software development
++@dircategory Programming tools:
+ @direntry
+-* GNU libtextstyle: (libtextstyle).     Output of styled text.
++* GNU libtextstyle: (libtextstyle).   Output of styled text
+ @end direntry
+ @end ifinfo
+ 

diff --git a/gettext-libdir.patch b/gettext-libdir.patch
index 1baaf5964b43881f2afe73c0de0add9668a281b6..1e3086db8620ac52fd652fb4f9b1404065eff33c 100644 (file)
--- a/gettext-libdir.patch
+++ b/gettext-libdir.patch
@@ -1,20 +1,20 @@
---- gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-prefix.m4.orig      2016-06-11 14:59:32.000000000 +0200
-+++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-prefix.m4   2017-02-05 14:26:12.237083553 +0100
-@@ -205,12 +205,14 @@
-         for searchdir in $searchpath; do
-           if test -d "$searchdir"; then
-             case "$searchdir" in
-+              */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
-               */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-               */../ | */.. )
-                 # Better ignore directories of this form. They are misleading.
-                 ;;
-               *) searchdir=`cd "$searchdir" && pwd`
+--- gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4.orig        2019-06-18 17:53:08.859806346 +0200
++++ gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4     2019-06-18 18:56:16.922617983 +0200
+@@ -225,12 +225,14 @@
+                if test -d "$searchdir"; then

                   case "$searchdir" in
                   case "$searchdir" in

-+                   */libx32 ) acl_libdirstem=libx32 ;;
-                    */lib64 ) acl_libdirstem=lib64 ;;
-                  esac ;;
-             esac
+                    */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
+                    */../ | */.. )
+                      # Better ignore directories of this form. They are misleading.
+                      ;;
+                    *) searchdir=`cd "$searchdir" && pwd`
+                       case "$searchdir" in
+                         */lib64 ) acl_libdirstem=lib64 ;;
++                        */libx32 ) acl_libdirstem=libx32 ;;
+                       esac ;;
+                  esac
+                fi

 --- gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4.orig        2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4     2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@
 --- gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4.orig        2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4     2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@


@@ -30,23 +30,23 @@
              if test "X$found_so" != "X"; then
                dnl Linking with a shared library. We attempt to hardcode its
                dnl directory into the executable's runpath, unless it's the
              if test "X$found_so" != "X"; then
                dnl Linking with a shared library. We attempt to hardcode its
                dnl directory into the executable's runpath, unless it's the

---- gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-prefix.m4.orig        2016-06-11 14:59:32.000000000 +0200
-+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-prefix.m4     2017-02-05 14:26:12.237083553 +0100
-@@ -205,12 +205,14 @@
-         for searchdir in $searchpath; do
-           if test -d "$searchdir"; then
-             case "$searchdir" in
-+              */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
-               */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-               */../ | */.. )
-                 # Better ignore directories of this form. They are misleading.
-                 ;;
-               *) searchdir=`cd "$searchdir" && pwd`
+--- gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4.orig  2016-06-11 14:59:32.000000000 +0200
++++ gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4       2017-02-05 14:26:12.237083553 +0100
+@@ -225,12 +225,14 @@
+                if test -d "$searchdir"; then

                   case "$searchdir" in
                   case "$searchdir" in

-+                   */libx32 ) acl_libdirstem=libx32 ;;
-                    */lib64 ) acl_libdirstem=lib64 ;;
-                  esac ;;
-             esac
+                    */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
++                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
+                    */../ | */.. )
+                      # Better ignore directories of this form. They are misleading.
+                      ;;
+                    *) searchdir=`cd "$searchdir" && pwd`
+                       case "$searchdir" in
+                         */lib64 ) acl_libdirstem=lib64 ;;
++                        */libx32 ) acl_libdirstem=libx32 ;;
+                       esac ;;
+                  esac
+                fi

 --- gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4.orig  2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4       2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@
 --- gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4.orig  2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4       2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@

diff --git a/gettext-libintl_by_gcj.patch b/gettext-libintl_by_gcj.patch
deleted file mode 100644 (file)
index a3ed02b..0000000
--- a/gettext-libintl_by_gcj.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-0.18/gettext-runtime/configure.ac.orig     2010-03-29 00:06:07.000000000 +0200
-+++ gettext-0.18/gettext-runtime/configure.ac  2010-05-16 09:05:06.198932556 +0200
-@@ -35,7 +35,7 @@
- 
- gt_JAVA_CHOICE
- 
--gt_JAVACOMP([1.3], [1.1])
-+gt_JAVACOMP([1.3], [1.4])
- AC_CHECK_PROG([JAR], [jar], [jar])
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
-   BUILDJAVA=yes

diff --git a/gettext.spec b/gettext.spec
index 99561af4d8fba6d71d2bd9d746d58eeb12fc6e66..74bf97daf2ec772646afd2c9436bb45379183608 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -16,7 +16,7 @@
 %bcond_without dotnet          # .NET support package
 %bcond_with    bootstrap       # no system GLib and libcroco (for bootstrap)
 
 %bcond_without dotnet          # .NET support package
 %bcond_with    bootstrap       # no system GLib and libcroco (for bootstrap)
 

-%ifnarch %{ix86} %{x8664} arm hppa ppc s390 s390x
+%ifnarch %{ix86} %{x8664} %{arm} hppa ppc s390 s390x

 %undefine with_dotnet
 %endif
 %ifarch i386
 %undefine with_dotnet
 %endif
 %ifarch i386


@@ -45,51 +45,48 @@ Summary(ru.UTF-8):  Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):     Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext
 Summary(tr.UTF-8):     Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext

-Version:       0.19.8.1
-Release:       7
+Version:       0.20.1
+Release:       1

 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools

-Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.lz
-# Source0-md5: d838d2c4144261d0c5fbab4a0aceb5c1
+Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
+# Source0-md5: 9ed9e26ab613b668e0026222a9c23639

 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch

-Patch2:                %{name}-libintl_by_gcj.patch

 Patch3:                %{name}-libdir.patch
 Patch3:                %{name}-libdir.patch

-Patch4:                perlre.patch
-Patch5:                java.patch

 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: acl-devel
 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: acl-devel

-BuildRequires: autoconf >= 2.62
+BuildRequires: autoconf >= 2.63

 BuildRequires: automake >= 1:1.13
 %{?with_gcj:BuildRequires:     gcc-java >= 3.0}
 %{!?with_bootstrap:BuildRequires:      glib2-devel >= 2.0}
 %if %{build_java}
 BuildRequires: jar
 %endif
 BuildRequires: automake >= 1:1.13
 %{?with_gcj:BuildRequires:     gcc-java >= 3.0}
 %{!?with_bootstrap:BuildRequires:      glib2-devel >= 2.0}
 %if %{build_java}
 BuildRequires: jar
 %endif

-%{?with_javac:BuildRequires:   jdk >= 1.3}
+%{?with_javac:BuildRequires:   jdk >= 1.6}

 %{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}
 %{!?with_bootstrap:BuildRequires:      libcroco-devel >= 0.6.1}

-%if "%(echo %{cc_version} | grep -q '^4.[2-9]'; echo $?)" == "0"
+%if "%{cc_version}" >= "4.2"

 BuildRequires: libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}
 BuildRequires: libtool >= 2:2
 BuildRequires: libunistring-devel
 BuildRequires: libgomp-devel
 %endif
 %{?with_asprintf:BuildRequires:        libstdc++-devel}
 BuildRequires: libtool >= 2:2
 BuildRequires: libunistring-devel

-BuildRequires: libxml2-devel
-BuildRequires: lzip
+%{!?with_bootstrap:BuildRequires:      libxml2-devel}

 %{?with_dotnet:BuildRequires:  mono-csharp}
 BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
 %{?with_xemacs:BuildRequires:  xemacs}
 %{?with_dotnet:BuildRequires:  mono-csharp}
 BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
 %{?with_xemacs:BuildRequires:  xemacs}

+BuildRequires: xz

 Obsoletes:     gettext-base
 Conflicts:     intltool < 0.28
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # adjust -f when needed (e.g. 0.18.3.x used ABI 0.18.3, 0.19.5.x uses full version)
 Obsoletes:     gettext-base
 Conflicts:     intltool < 0.28
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # adjust -f when needed (e.g. 0.18.3.x used ABI 0.18.3, 0.19.5.x uses full version)

-%define                intabi  %(echo %{version} | cut -d. -f1-4)
+%define                intabi  %(echo %{version} | cut -d. -f1-3)

 # similarly for its data
 # similarly for its data

-%define                dataver %(echo %{version} | cut -d. -f1-3)
+%define                dataver %(echo %{version} | cut -d. -f1-2)

 
 %description
 The GNU gettext package provides a set of tools and documentation for
 
 %description
 The GNU gettext package provides a set of tools and documentation for


@@ -371,10 +368,7 @@ GNU gettext dla C#.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

-%patch2 -p1

 %patch3 -p1
 %patch3 -p1

-%patch4 -p1
-%patch5 -p1

 
 %{__sed} -i \
        -e 's@m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \
 
 %{__sed} -i \
        -e 's@m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \


@@ -384,8 +378,11 @@ GNU gettext dla C#.
        gettext-runtime/configure.ac \
        gettext-tools/configure.ac
 
        gettext-runtime/configure.ac \
        gettext-tools/configure.ac
 

+%if %{without bootstrap}
+%{__sed} -i -e '/gl_LIBCROCO\|gl_LIBGLIB\|gl_LIBXML/s/(\[yes\])//' libtextstyle/gnulib-m4/gnulib-comp.m4
+%endif
+

 %build
 %build

-%{__libtoolize}

 cd gettext-runtime
 %{__libtoolize}
 %{__aclocal} -I m4 -I ../m4 -I gnulib-m4
 cd gettext-runtime
 %{__libtoolize}
 %{__aclocal} -I m4 -I ../m4 -I gnulib-m4


@@ -397,12 +394,22 @@ cd libasprintf
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd ../../gettext-tools
+cd ../../libtextstyle
+%{__libtoolize}
+%{__aclocal} -I m4 -I gnulib-m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../gettext-tools

 %{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd ..
+cd examples
+%{__aclocal} -I ../../gettext-runtime/m4 -I ../../m4
+%{__autoconf}
+%{__automake}
+cd ../..

 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}


@@ -414,11 +421,10 @@ cd ..
        --disable-java \
 %endif
        --enable-nls \
        --disable-java \
 %endif
        --enable-nls \

+       --disable-silent-rules \

        --without-bzip2 \
        --without-git \
        --without-included-gettext \
        --without-bzip2 \
        --without-git \
        --without-included-gettext \

-       %{?with_bootstrap:--with-included-glib} \
-       %{?with_bootstrap:--with-included-libcroco} \

        --with-xz
 %{__make} \
        GMSGFMT=`pwd`/gettext-tools/src/msgfmt
        --with-xz
 %{__make} \
        GMSGFMT=`pwd`/gettext-tools/src/msgfmt


@@ -443,7 +449,7 @@ install -d $RPM_BUILD_ROOT{/bin,%{_datadir}/gettext/its}
        examplesbuildauxdir=%{_examplesdir}/%{name}-%{version}/build-aux \
        DESTDIR=$RPM_BUILD_ROOT
 
        examplesbuildauxdir=%{_examplesdir}/%{name}-%{version}/build-aux \
        DESTDIR=$RPM_BUILD_ROOT
 

-mv -f $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,n}gettext $RPM_BUILD_ROOT/bin

 
 # these static libs are removed in install-exec-clean
 cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \
 
 # these static libs are removed in install-exec-clean
 cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \


@@ -451,6 +457,7 @@ cp -a gettext-tools/gnulib-lib/.libs/libgettextlib.a \
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gettext
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libasprintf
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gettext
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libasprintf

+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libtextstyle

 %{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}-runtime
 %{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}-runtime


@@ -468,6 +475,12 @@ rm -rf $RPM_BUILD_ROOT
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 

+%post  devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        devel -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+

 %post  -n libasprintf -p /sbin/ldconfig
 %postun        -n libasprintf -p /sbin/ldconfig
 
 %post  -n libasprintf -p /sbin/ldconfig
 %postun        -n libasprintf -p /sbin/ldconfig
 


@@ -502,39 +515,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gettext/project-id
 %attr(755,root,root) %{_libdir}/gettext/urlget
 %attr(755,root,root) %{_libdir}/gettext/user-email
 %attr(755,root,root) %{_libdir}/gettext/project-id
 %attr(755,root,root) %{_libdir}/gettext/urlget
 %attr(755,root,root) %{_libdir}/gettext/user-email

-%{_aclocaldir}/codeset.m4
-%{_aclocaldir}/extern-inline.m4
-%{_aclocaldir}/fcntl-o.m4

 %{_aclocaldir}/gettext.m4
 %{_aclocaldir}/gettext.m4

-%{_aclocaldir}/glibc2.m4
-%{_aclocaldir}/glibc21.m4
+%{_aclocaldir}/host-cpu-c-abi.m4

 %{_aclocaldir}/iconv.m4
 %{_aclocaldir}/iconv.m4

-%{_aclocaldir}/intdiv0.m4
-%{_aclocaldir}/intl.m4
-%{_aclocaldir}/intldir.m4

 %{_aclocaldir}/intlmacosx.m4
 %{_aclocaldir}/intlmacosx.m4

-%{_aclocaldir}/intmax.m4
-%{_aclocaldir}/inttypes-pri.m4
-%{_aclocaldir}/inttypes_h.m4
-%{_aclocaldir}/lcmessage.m4

 %{_aclocaldir}/lib-ld.m4
 %{_aclocaldir}/lib-link.m4
 %{_aclocaldir}/lib-prefix.m4
 %{_aclocaldir}/lib-ld.m4
 %{_aclocaldir}/lib-link.m4
 %{_aclocaldir}/lib-prefix.m4

-%{_aclocaldir}/lock.m4
-%{_aclocaldir}/longlong.m4

 %{_aclocaldir}/nls.m4
 %{_aclocaldir}/po.m4
 %{_aclocaldir}/nls.m4
 %{_aclocaldir}/po.m4

-%{_aclocaldir}/printf-posix.m4

 %{_aclocaldir}/progtest.m4
 %{_aclocaldir}/progtest.m4

-%{_aclocaldir}/size_max.m4
-%{_aclocaldir}/stdint_h.m4
-%{_aclocaldir}/threadlib.m4
-%{_aclocaldir}/uintmax_t.m4
-%{_aclocaldir}/visibility.m4
-%{_aclocaldir}/wchar_t.m4
-%{_aclocaldir}/wint_t.m4
-%{_aclocaldir}/xsize.m4
-%{_infodir}/gettext*.info*
+%{_infodir}/gettext.info*

 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
 %{_mandir}/man1/recode-sr-latin.1*
 %{_mandir}/man1/gettextize.1*
 %{_mandir}/man1/msg*.1*
 %{_mandir}/man1/recode-sr-latin.1*


@@ -551,9 +542,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gettext/ABOUT-NLS
 %attr(755,root,root) %{_datadir}/gettext/config.rpath
 %{_datadir}/gettext/gettext.h
 %{_datadir}/gettext/ABOUT-NLS
 %attr(755,root,root) %{_datadir}/gettext/config.rpath
 %{_datadir}/gettext/gettext.h

-%dir %{_datadir}/gettext/intl
-%{_datadir}/gettext/intl/[!c]*
-%attr(755,root,root) %{_datadir}/gettext/intl/config.charset

 %dir %{_datadir}/gettext/its
 %{_datadir}/gettext/msgunfmt.tcl
 %{_datadir}/gettext/po
 %dir %{_datadir}/gettext/its
 %{_datadir}/gettext/msgunfmt.tcl
 %{_datadir}/gettext/po


@@ -586,22 +574,30 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgettextsrc-%{intabi}.so
 %attr(755,root,root) %{_libdir}/libgettextpo.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgettextpo.so.0
 %attr(755,root,root) %{_libdir}/libgettextsrc-%{intabi}.so
 %attr(755,root,root) %{_libdir}/libgettextpo.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgettextpo.so.0

+%attr(755,root,root) %{_libdir}/libtextstyle.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtextstyle.so.0

 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgettextlib.so
 %attr(755,root,root) %{_libdir}/libgettextsrc.so
 %attr(755,root,root) %{_libdir}/libgettextpo.so
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgettextlib.so
 %attr(755,root,root) %{_libdir}/libgettextsrc.so
 %attr(755,root,root) %{_libdir}/libgettextpo.so

+%attr(755,root,root) %{_libdir}/libtextstyle.so

 %{_libdir}/libgettextlib.la
 %{_libdir}/libgettextsrc.la
 %{_libdir}/libgettextpo.la
 %{_libdir}/libgettextlib.la
 %{_libdir}/libgettextsrc.la
 %{_libdir}/libgettextpo.la

+%{_libdir}/libtextstyle.la

 %{_includedir}/gettext-po.h
 %{_includedir}/gettext-po.h

+%{_includedir}/textstyle.h
+%{_includedir}/textstyle
+%{_infodir}/libtextstyle.info*

 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgettextlib.a
 %{_libdir}/libgettextsrc.a
 %{_libdir}/libgettextpo.a
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgettextlib.a
 %{_libdir}/libgettextsrc.a
 %{_libdir}/libgettextpo.a

+%{_libdir}/libtextstyle.a

 
 %if %{with asprintf}
 %files -n libasprintf
 
 %if %{with asprintf}
 %files -n libasprintf

diff --git a/java.patch b/java.patch
deleted file mode 100644 (file)
index d1c42cd..0000000
--- a/java.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gettext-0.19.8.1/gettext-tools/gnulib-m4/javacomp.m4~      2016-06-11 15:00:03.000000000 +0200
-+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/javacomp.m4       2017-09-03 12:02:50.751509338 +0200
-@@ -99,7 +99,7 @@
-          CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&AS_MESSAGE_LOG_FD
-        }`
-        case "$target_version" in
--         1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6) ;;
-+         1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6 | 1.7 | 1.8) ;;
-          null)
-            dnl JDK 1.1.X returns null.
-            target_version=1.1 ;;
-@@ -127,6 +127,8 @@
-     1.4) cfversion=48 ;;
-     1.5) cfversion=49 ;;
-     1.6) cfversion=50 ;;
-+    1.7) cfversion=51 ;;
-+    1.8) cfversion=52 ;;
-     *) AC_MSG_ERROR([invalid target-version argument to gt_@&t@JAVACOMP: $target_version]) ;;
-   esac
-   # Function to output the classfile version of a file (8th byte) in decimal.

diff --git a/perlre.patch b/perlre.patch
deleted file mode 100644 (file)
index 38a9666..0000000
--- a/perlre.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- gettext-0.19.8.1/gettext-runtime/libasprintf/texi2html.orig        2015-12-08 13:50:04.000000000 +0100
-+++ gettext-0.19.8.1/gettext-runtime/libasprintf/texi2html     2017-09-03 11:56:03.019241853 +0200
-@@ -879,7 +879,7 @@
-     s/\@refill\s+//g;
-     # other substitutions
-     &simple_substitutions;
--    s/\@value{($VARRE)}/$value{$1}/eg;
-+    s/\@value\{($VARRE)\}/$value{$1}/eg;
-     s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
-     #
-     # analyze the tag again
-@@ -1204,7 +1204,7 @@
-     #
-     # xref
-     #
--    while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
-+    while (/\@(x|px|info|)ref\{($XREFRE)(\}?)/o) {
-       # note: Texinfo may accept other characters
-       ($type, $nodes, $full) = ($1, $2, $3);
-       ($before, $after) = ($`, $');
-@@ -1810,7 +1810,7 @@
-     while ($changed) {
-       $changed = 0;
-       $done = '';
--      while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) {
-+      while (/\@\(\w+|"|\~|,|\^\)\{([^\{\}]+)\}/) {
-           $text = &apply_style($1, $2);
-           if ($text) {
-               $_ = "$`$text$'";
---- gettext-0.19.8.1/gettext-tools/doc/texi2html.orig  2017-09-03 11:56:41.053102137 +0200
-+++ gettext-0.19.8.1/gettext-tools/doc/texi2html       2017-09-03 11:57:44.060639306 +0200
-@@ -879,7 +879,7 @@
-     s/\@refill\s+//g;
-     # other substitutions
-     &simple_substitutions;
--    s/\@value{($VARRE)}/$value{$1}/eg;
-+    s/\@value\{($VARRE)\}/$value{$1}/eg;
-     s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
-     #
-     # analyze the tag again
-@@ -1204,7 +1204,7 @@
-     #
-     # xref
-     #
--    while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
-+    while (/\@(x|px|info|)ref\{($XREFRE)(\}?)/o) {
-       # note: Texinfo may accept other characters
-       ($type, $nodes, $full) = ($1, $2, $3);
-       ($before, $after) = ($`, $');
-@@ -1810,7 +1810,7 @@
-     while ($changed) {
-       $changed = 0;
-       $done = '';
--      while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) {
-+      while (/\@(\w+|"|\~|,|\^)\{([^\{\}]+)\}/) {
-           $text = &apply_style($1, $2);
-           if ($text) {
-               $_ = "$`$text$'";