From 12ba4a66a454a11ea3836afc9e0bfa8eb9489991 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 16 Jul 2015 16:17:17 +0200 Subject: [PATCH] - updated to 0.19.5 - updated info patch --- gettext-info.patch | 67 ++++++++++++++++++++++++++-------------------- gettext.spec | 7 ++--- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/gettext-info.patch b/gettext-info.patch index 2ea6255..85697db 100644 --- a/gettext-info.patch +++ b/gettext-info.patch @@ -1,5 +1,5 @@ ---- gettext-0.19/gettext-tools/doc/gettext.texi.orig 2014-05-10 09:18:35.000000000 +0200 -+++ gettext-0.19/gettext-tools/doc/gettext.texi 2014-06-03 16:53:27.618097960 +0200 +--- 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 @@ -47,30 +47,30 @@ @include version.texi @@ -130,7 +130,7 @@ Other Programming Languages -@@ -445,10 +445,10 @@ +@@ -446,10 +446,10 @@ * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization * gettext.sh:: Contents of @code{gettext.sh} * gettext Invocation:: Invoking the @code{gettext} program @@ -145,7 +145,7 @@ Perl -@@ -995,7 +995,7 @@ +@@ -996,7 +996,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 -@@ -1070,7 +1070,7 @@ +@@ -1071,7 +1071,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 -@@ -1094,8 +1094,8 @@ +@@ -1095,8 +1095,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 -@@ -1490,7 +1490,7 @@ +@@ -1491,7 +1491,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} -@@ -2532,7 +2532,7 @@ +@@ -2533,7 +2533,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 -@@ -2564,7 +2564,7 @@ +@@ -2565,7 +2565,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. -@@ -2594,8 +2594,7 @@ +@@ -2595,8 +2595,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: -@@ -2891,10 +2890,10 @@ +@@ -2892,10 +2891,10 @@ @c FIXME: Rewrite. @menu @@ -224,7 +224,7 @@ @section Invoking the @code{xgettext} Program @include xgettext.texi -@@ -2923,16 +2922,16 @@ +@@ -2924,16 +2923,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 -@@ -3159,10 +3158,10 @@ +@@ -3160,10 +3159,10 @@ @chapter Updating Existing PO Files @menu @@ -257,7 +257,7 @@ @section Invoking the @code{msgmerge} Program @include msgmerge.texi -@@ -4702,71 +4701,71 @@ +@@ -4703,71 +4702,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 -@@ -5296,22 +5295,22 @@ +@@ -5297,22 +5296,22 @@ @c FIXME: Rewrite. @menu @@ -378,7 +378,16 @@ @section The Format of GNU MO Files @cindex MO file's format @cindex file format, @file{.mo} -@@ -7553,7 +7552,7 @@ +@@ -6226,7 +6225,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 +-use it as a baseline (@pxref{msginit Invocation}).} ++use it as a baseline (@pxref{msginit}).} + + @table @asis + @item Only one form: +@@ -7579,7 +7578,7 @@ @menu * Flat and Non-Flat:: Flat or Non-Flat Directory Structures * Prerequisites:: Prerequisite Works @@ -387,7 +396,7 @@ * Adjusting Files:: Files You Must Create or Alter * autoconf macros:: Autoconf macros for use in @file{configure.ac} * Version Control Issues:: -@@ -7586,7 +7585,7 @@ +@@ -7612,7 +7611,7 @@ described in the remaining of this chapter. Some maintainers might use this as an opportunity to unflatten their package structure. @@ -396,7 +405,7 @@ @section Prerequisite Works @cindex converting a package to use @code{gettext} @cindex migration from earlier versions of @code{gettext} -@@ -7671,12 +7670,12 @@ +@@ -7697,12 +7696,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. @@ -411,7 +420,7 @@ @section Files You Must Create or Alter @cindex @code{gettext} files -@@ -7839,7 +7838,7 @@ +@@ -7864,7 +7863,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 @@ -420,7 +429,7 @@ @node configure.ac, config.guess, po/Rules-*, Adjusting Files @subsection @file{configure.ac} at top level -@@ -8583,7 +8582,7 @@ +@@ -8608,7 +8607,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}. @@ -429,7 +438,7 @@ accepts. The use of this macro is an alternative to the use of the -@@ -8653,7 +8652,7 @@ +@@ -8678,7 +8677,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 @@ -438,7 +447,7 @@ @end menu @node Distributed Development, Files under Version Control, Version Control Issues, Version Control Issues -@@ -8775,7 +8774,7 @@ +@@ -8800,7 +8799,7 @@ use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer installed. @@ -447,7 +456,7 @@ @subsection Put PO Files under Version Control Since translations are valuable assets as well as the source code, it -@@ -8824,7 +8823,7 @@ +@@ -8849,7 +8848,7 @@ @end itemize @@ -456,7 +465,7 @@ @subsection Invoking the @code{autopoint} Program @include autopoint.texi -@@ -9555,10 +9554,10 @@ +@@ -9593,10 +9592,10 @@ * Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization * gettext.sh:: Contents of @code{gettext.sh} * gettext Invocation:: Invoking the @code{gettext} program @@ -471,7 +480,7 @@ @end menu @node Preparing Shell Scripts, gettext.sh, sh, sh -@@ -9579,8 +9578,8 @@ +@@ -9617,8 +9616,8 @@ near the top of the script. @code{gettext.sh} is a shell function library that provides the functions @@ -482,7 +491,7 @@ You have to ensure that @code{gettext.sh} can be found in the @code{PATH}. @item -@@ -9690,13 +9689,13 @@ +@@ -9728,13 +9727,13 @@ and a newline, without interpreting backslashes in the argument string. @item eval_gettext @@ -499,7 +508,7 @@ @subsubsection Invoking the @code{gettext} program @include rt-gettext.texi -@@ -9705,7 +9704,7 @@ +@@ -9743,7 +9742,7 @@ @code{gettext} invocation, where no options are present and the @var{textdomain} is implicit, from the environment. @@ -508,7 +517,7 @@ @subsubsection Invoking the @code{ngettext} program @include rt-ngettext.texi -@@ -9714,12 +9713,12 @@ +@@ -9752,12 +9751,12 @@ @code{ngettext} invocation, where no options are present and the @var{textdomain} is implicit, from the environment. @@ -523,7 +532,7 @@ @subsubsection Invoking the @code{eval_gettext} function @cindex @code{eval_gettext} function, usage -@@ -9732,7 +9731,7 @@ +@@ -9770,7 +9769,7 @@ performing dollar-substitution on the result. Note that only shell variables mentioned in @var{msgid} will be dollar-substituted in the result. diff --git a/gettext.spec b/gettext.spec index 092fac2..9aef3d9 100644 --- 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.4 -Release: 3 +Version: 0.19.5 +Release: 1 License: LGPL v2+ (libintl), GPL v3+ (tools) Group: Development/Tools Source0: http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz -# Source0-md5: 997c9070354eff5517115feaea6038f0 +# Source0-md5: 546a8458f50e146be12c215f83b9bac2 Patch0: %{name}-info.patch Patch1: %{name}-killkillkill.patch Patch2: %{name}-libintl_by_gcj.patch @@ -479,6 +479,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/recode-sr-latin %attr(755,root,root) %{_bindir}/xgettext %attr(755,root,root) %{_libdir}/preloadable_libintl.so +%attr(755,root,root) %{_libdir}/gettext/cldr-plurals %attr(755,root,root) %{_libdir}/gettext/hostname %attr(755,root,root) %{_libdir}/gettext/project-id %attr(755,root,root) %{_libdir}/gettext/urlget -- 2.44.0