- updated to 0.19.7

- updated info patch

diff --git a/gettext-info.patch b/gettext-info.patch
index 85697dbab9a61c54330bc4211d374db2422e2fa1..17c1f63465e3d9a96d3410cd57c8432525dfba54 100644 (file)
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,5 +1,5 @@
---- gettext-0.19.5/gettext-tools/doc/gettext.texi.orig 2015-06-22 11:21:59.000000000 +0200
-+++ gettext-0.19.5/gettext-tools/doc/gettext.texi      2015-07-15 21:34:28.640702629 +0200
+--- 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
 @@ -47,30 +47,30 @@
  @include version.texi
  
@@ -145,7 +145,7 @@
  
  Perl
  
-@@ -996,7 +996,7 @@
+@@ -998,7 +998,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.
@@ -154,7 +154,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
-@@ -1071,7 +1071,7 @@
+@@ -1073,7 +1073,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
@@ -163,7 +163,7 @@
  @code{msgmerge} really does.
  
  Whatever route or means taken, the goal is to obtain an updated
-@@ -1095,8 +1095,8 @@
+@@ -1097,8 +1097,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
@@ -174,7 +174,7 @@
  for the @code{msgfmt} program.
  
  Finally, the modified and marked C sources are compiled and linked
-@@ -1491,7 +1491,7 @@
+@@ -1493,7 +1493,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.
@@ -183,7 +183,7 @@
  
  @item objc-format
  @kwindex objc-format@r{ flag}
-@@ -2533,7 +2533,7 @@
+@@ -2535,7 +2535,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
@@ -192,7 +192,7 @@
  used for solving this problem.
  
  @node Special cases, Bug Report Address, c-format Flag, Sources
-@@ -2565,7 +2565,7 @@
+@@ -2567,7 +2567,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
@@ -201,7 +201,7 @@
  can find them, and second we have to translate the string at runtime
  before printing them.
  
-@@ -2595,8 +2595,7 @@
+@@ -2597,8 +2597,7 @@
  
  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 +211,7 @@
  
  The above is of course not the only solution.  You could also come along
  with the following one:
-@@ -2892,10 +2891,10 @@
+@@ -2894,10 +2893,10 @@
  @c FIXME: Rewrite.
  
  @menu
@@ -224,7 +224,7 @@
  @section Invoking the @code{xgettext} Program
  
  @include xgettext.texi
-@@ -2924,16 +2923,16 @@
+@@ -2926,16 +2925,16 @@
  the header entry of this file.
  
  @menu
@@ -244,7 +244,7 @@
  @section Filling in the Header Entry
  @cindex header entry of a PO file
  
-@@ -3160,10 +3159,10 @@
+@@ -3162,10 +3161,10 @@
  @chapter Updating Existing PO Files
  
  @menu
@@ -257,7 +257,7 @@
  @section Invoking the @code{msgmerge} Program
  
  @include msgmerge.texi
-@@ -4703,71 +4702,71 @@
+@@ -4705,71 +4704,71 @@
  write other specialized programs that process PO files.
  
  @menu
@@ -350,7 +350,7 @@
  @section Highlighting parts of PO files
  
  Translators are usually only interested in seeing the untranslated and
-@@ -5297,22 +5296,22 @@
+@@ -5299,22 +5298,22 @@
  @c FIXME: Rewrite.
  
  @menu
@@ -378,7 +378,7 @@
  @section The Format of GNU MO Files
  @cindex MO file's format
  @cindex file format, @file{.mo}
-@@ -6226,7 +6225,7 @@
+@@ -6228,7 +6227,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
@@ -387,7 +387,7 @@
  
  @table @asis
  @item Only one form:
-@@ -7579,7 +7578,7 @@
+@@ -7581,7 +7580,7 @@
  @menu
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works
@@ -396,7 +396,7 @@
  * Adjusting Files::             Files You Must Create or Alter
  * autoconf macros::             Autoconf macros for use in @file{configure.ac}
  * Version Control Issues::      
-@@ -7612,7 +7611,7 @@
+@@ -7614,7 +7613,7 @@
  described in the remaining of this chapter.  Some maintainers might
  use this as an opportunity to unflatten their package structure.
  
@@ -405,7 +405,7 @@
  @section Prerequisite Works
  @cindex converting a package to use @code{gettext}
  @cindex migration from earlier versions of @code{gettext}
-@@ -7697,12 +7696,12 @@
+@@ -7699,12 +7698,12 @@
  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.
  
@@ -420,7 +420,7 @@
  @section Files You Must Create or Alter
  @cindex @code{gettext} files
  
-@@ -7864,7 +7863,7 @@
+@@ -7866,7 +7865,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
@@ -429,7 +429,7 @@
  
  @node configure.ac, config.guess, po/Rules-*, Adjusting Files
  @subsection @file{configure.ac} at top level
-@@ -8608,7 +8607,7 @@
+@@ -8610,7 +8609,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}.
  
@@ -438,7 +438,7 @@
  accepts.
  
  The use of this macro is an alternative to the use of the
-@@ -8678,7 +8677,7 @@
+@@ -8680,7 +8679,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
@@ -447,7 +447,7 @@
  @end menu
  
  @node Distributed Development, Files under Version Control, Version Control Issues, Version Control Issues
-@@ -8800,7 +8799,7 @@
+@@ -8802,7 +8801,7 @@
  use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
  installed.
  
@@ -456,7 +456,7 @@
  @subsection Put PO Files under Version Control
  
  Since translations are valuable assets as well as the source code, it
-@@ -8849,7 +8848,7 @@
+@@ -8851,7 +8850,7 @@
  
  @end itemize
  
@@ -465,7 +465,7 @@
  @subsection Invoking the @code{autopoint} Program
  
  @include autopoint.texi
-@@ -9593,10 +9592,10 @@
+@@ -9595,10 +9594,10 @@
  * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
  * gettext.sh::                  Contents of @code{gettext.sh}
  * gettext Invocation::          Invoking the @code{gettext} program
@@ -480,7 +480,7 @@
  @end menu
  
  @node Preparing Shell Scripts, gettext.sh, sh, sh
-@@ -9617,8 +9616,8 @@
+@@ -9619,8 +9618,8 @@
  
  near the top of the script.  @code{gettext.sh} is a shell function library
  that provides the functions
@@ -491,7 +491,7 @@
  You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
  
  @item
-@@ -9728,13 +9727,13 @@
+@@ -9730,13 +9729,13 @@
  and a newline, without interpreting backslashes in the argument string.
  
  @item eval_gettext
@@ -508,7 +508,7 @@
  @subsubsection Invoking the @code{gettext} program
  
  @include rt-gettext.texi
-@@ -9743,7 +9742,7 @@
+@@ -9745,7 +9744,7 @@
  @code{gettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  
@@ -517,7 +517,7 @@
  @subsubsection Invoking the @code{ngettext} program
  
  @include rt-ngettext.texi
-@@ -9752,12 +9751,12 @@
+@@ -9754,12 +9753,12 @@
  @code{ngettext} invocation, where no options are present and the
  @var{textdomain} is implicit, from the environment.
  
@@ -532,7 +532,7 @@
  @subsubsection Invoking the @code{eval_gettext} function
  
  @cindex @code{eval_gettext} function, usage
-@@ -9770,7 +9769,7 @@
+@@ -9772,7 +9771,7 @@
  performing dollar-substitution on the result.  Note that only shell variables
  mentioned in @var{msgid} will be dollar-substituted in the result.
  
@@ -541,6 +541,15 @@
  @subsubsection Invoking the @code{eval_ngettext} function
  
  @cindex @code{eval_ngettext} function, usage
+@@ -12385,7 +12384,7 @@
+ Special Characters} data category can be used.
+ 
+ To merge the translations, the @samp{msgfmt} program can be used with
+-the option @code{--xml}.  @xref{msgfmt Invocation}, for more details
++the option @code{--xml}.  @xref{msgfmt}, for more details
+ 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.
 --- 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 @@

diff --git a/gettext.spec b/gettext.spec
index 0a107bf15a584c0eaebfa26eca41ba51cd377f9f..dc34f96e9125417cbef6e05b2f0ec11b46464819 100644 (file)
--- a/gettext.spec
+++ b/gettext.spec
@@ -39,12 +39,12 @@ Summary(ru.UTF-8):  Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):     Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):     Бібліотеки та утиліти для підтримки національних мов
 Name:          gettext
-Version:       0.19.6
+Version:       0.19.7
 Release:       1
 License:       LGPL v2+ (libintl), GPL v3+ (tools)
 Group:         Development/Tools
 Source0:       http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.lz
-# Source0-md5: 45b2a123cdc7cef54df98152a0da3fcc
+# Source0-md5: 0008c0ac4958eb9749362fbac4bdf750
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-killkillkill.patch
 Patch2:                %{name}-libintl_by_gcj.patch
@@ -555,6 +555,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/team-address
 %attr(755,root,root) %{_datadir}/gettext/projects/TP/trigger
 %{_datadir}/gettext/styles
+%dir %{_datadir}/gettext-%{version}
+%{_datadir}/gettext-%{version}/its
 
 %files demo
 %defattr(644,root,root,755)