[packages/gettext] - updated to 1.0
qboosh
qboosh at pld-linux.org
Fri Jul 3 18:59:10 CEST 2026
commit 89774f1445fade6addb2fef8e2a4db9cfec1d06d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jul 3 18:59:04 2026 +0200
- updated to 1.0
gettext-info.patch | 126 ++++++++++++++++++++++++++++++---------------
gettext-killkillkill.patch | 5 +-
gettext.spec | 19 +++++--
3 files changed, 101 insertions(+), 49 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index 2d2a70d..18c4f8b 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -40,12 +40,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.26
-Release: 2
+Version: 1.0
+Release: 1
License: LGPL v2.1+ (libintl), GPL v3+ (tools)
Group: Development/Tools
Source0: https://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.lz
-# Source0-md5: 22954d4bb74a5246de89a35fdfc5d174
+# Source0-md5: 83199a6c26bfda3f0c425b94e814139a
Patch0: %{name}-info.patch
Patch1: %{name}-killkillkill.patch
Patch2: %{name}-smack.patch
@@ -54,13 +54,15 @@ URL: http://www.gnu.org/software/gettext/
BuildRequires: acl-devel
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.13
-# also possible ldc, dmd, egdc (but gdc suppors more platforms)
+BuildRequires: curl-devel
+# also possible ldc, dmd, egdc (but gdc supports more platforms)
%{?with_d:BuildRequires: gcc-d}
%{?with_gcj:BuildRequires: gcc-java >= 3.0}
%{?with_modula2:BuildRequires: gcc-m2}
%{!?with_bootstrap:BuildRequires: glib2-devel >= 2.0}
%{?with_gcj:BuildRequires: jar}
%{?with_javac:%buildrequires_jdk}
+BuildRequires: json-c-devel >= 0.18
%{!?with_bootstrap:BuildRequires: libcroco-devel >= 0.6.1}
%if "%{cc_version}" >= "4.2"
BuildRequires: libgomp-devel
@@ -80,7 +82,9 @@ BuildRequires: smack-devel
BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
%{?with_xemacs:BuildRequires: xemacs}
-Obsoletes: gettext-base
+# for autopoint archive compression
+BuildRequires: xz
+Obsoletes: gettext-base < 1
Conflicts: intltool < 0.28
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -170,6 +174,7 @@ Group: Development/Tools
Requires(post,postun): /sbin/ldconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: iconv
+Requires: json-c >= 0.18
Conflicts: autoconf < 2.52
Conflicts: rpm-build-macros < 1.744
@@ -634,7 +639,9 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS README THANKS
%attr(755,root,root) %{_bindir}/gettextize
%attr(755,root,root) %{_bindir}/msg*
+%attr(755,root,root) %{_bindir}/po-fetch
%attr(755,root,root) %{_bindir}/recode-sr-latin
+%attr(755,root,root) %{_bindir}/spit
%attr(755,root,root) %{_bindir}/xgettext
%attr(755,root,root) %{_libdir}/preloadable_libintl.so
%dir %{_libexecdir}/gettext
@@ -685,7 +692,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/gettext.info*
%{_mandir}/man1/gettextize.1*
%{_mandir}/man1/msg*.1*
+%{_mandir}/man1/po-fetch.1*
%{_mandir}/man1/recode-sr-latin.1*
+%{_mandir}/man1/spit.1*
%{_mandir}/man1/xgettext.1*
%{_mandir}/man3/bind_textdomain_codeset.3*
%{_mandir}/man3/bindtextdomain.3*
diff --git a/gettext-info.patch b/gettext-info.patch
index 151e027..419cb6b 100644
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,6 +1,6 @@
---- gettext-0.26/gettext-tools/doc/gettext.texi.orig 2025-06-30 13:50:43.000000000 +0200
-+++ gettext-0.26/gettext-tools/doc/gettext.texi 2025-09-28 11:10:14.615394993 +0200
-@@ -59,32 +59,32 @@
+--- gettext-1.0/gettext-tools/doc/gettext.texi.orig 2026-01-27 05:45:13.000000000 +0100
++++ gettext-1.0/gettext-tools/doc/gettext.texi 2026-07-03 06:26:53.380227497 +0200
+@@ -59,33 +59,33 @@
@include version.texi
@ifinfo
@@ -21,11 +21,12 @@
-* msgfilter: (gettext)msgfilter Invocation. Pipe a PO file through a filter.
-* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files.
-* msggrep: (gettext)msggrep Invocation. Select part of a PO file.
--* msginit: (gettext)msginit Invocation. Create a fresh PO file.
+-* msginit: (gettext)msginit Invocation. Start translating a PO file.
-* msgmerge: (gettext)msgmerge Invocation. Update a PO file from template.
-* msgunfmt: (gettext)msgunfmt Invocation. Uncompile MO file into PO file.
-* msguniq: (gettext)msguniq Invocation. Unify duplicates for PO file.
-* ngettext: (gettext)ngettext Invocation. Translate a message with plural.
+-* po-fetch: (gettext)po-fetch Invocation. Fetches a set of PO files.
-* printf_gettext: (gettext)printf_gettext Invocation. Translate a format string.
-* printf_ngettext: (gettext)printf_ngettext Invocation. Translate a format string with plural.
-* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file.
@@ -45,11 +46,12 @@
+* msgfilter: (gettext)msgfilter. Pipe a PO file through a filter
+* msgfmt: (gettext)msgfmt. Make MO files out of PO files
+* msggrep: (gettext)msggrep. Select part of a PO file
-+* msginit: (gettext)msginit. Create a fresh PO file
++* msginit: (gettext)msginit. Start translating a PO file
+* msgmerge: (gettext)msgmerge. Update a PO file from template
+* msgunfmt: (gettext)msgunfmt. Uncompile MO file into PO file
-+* msguniq: (gettext)msguniq. Unify duplicates for PO file
++* msguniq: (gettext)msguniq. Unify duplicates for PO file.
+* ngettext: (gettext)ngettext. Translate a message with plural
++* po-fetch: (gettext)po-fetch. Fetches a set of PO files
+* printf_gettext: (gettext)printf_gettext. Translate a format string
+* printf_ngettext: (gettext)printf_ngettext. Translate a format string with plural
+* xgettext: (gettext)xgettext. Extract strings into a PO file
@@ -58,7 +60,7 @@
@end direntry
@end ifinfo
-@@ -241,17 +241,17 @@ Preparing Program Sources
+@@ -245,23 +245,23 @@ Preparing Program Sources
Making the PO Template File
@@ -77,9 +79,17 @@
-* msgmerge Invocation:: Invoking the @code{msgmerge} Program
+* msgmerge:: Invoking the @code{msgmerge} Program
+ Pretranslating PO Files
+
+ * Installing an LLM:: Installing a Large Language Model
+-* msgpre Invocation:: Invoking the @code{msgpre} Program
+-* spit Invocation:: Invoking the @code{spit} Program
++* msgpre:: Invoking the @code{msgpre} Program
++* spit:: Invoking the @code{spit} Program
+
Editing PO Files
-@@ -288,16 +288,16 @@ Using Translation Compendia
+@@ -298,16 +298,16 @@ Using Translation Compendia
Manipulating PO Files
@@ -106,7 +116,7 @@
* Colorizing:: Highlighting parts of PO files
* Other tools:: Other tools for manipulating PO files
* libgettextpo:: Writing your own programs that process PO files
-@@ -312,8 +312,8 @@ Highlighting parts of PO files
+@@ -322,8 +322,8 @@ Highlighting parts of PO files
Producing Binary MO Files
@@ -117,7 +127,7 @@
* MO Files:: The Format of GNU MO Files
The Programmer's View
-@@ -359,7 +359,7 @@ The Maintainer's View
+@@ -369,7 +369,7 @@ The Maintainer's View
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
@@ -125,17 +135,19 @@
+* gettextize:: Invoking the @code{gettextize} Program
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
- * Version Control Issues::
-@@ -394,7 +394,7 @@ Integrating with Version Control Systems
- * Distributed Development:: Avoiding version mismatch in distributed development
+ * Interfacing with the Translators::
+@@ -407,8 +407,8 @@ Integrating with Version Control Systems
* Files under Version Control:: Files to put under version control
- * Translations under Version Control:: Put PO Files under Version Control
+ * PO Template File under Version Control?:: Put the POT File under Version Control?
+ * Translations under Version Control?:: Put PO Files under Version Control?
-* autopoint Invocation:: Invoking the @code{autopoint} Program
+-* po-fetch Invocation:: Invoking the @code{po-fetch} Program
+* autopoint:: Invoking the @code{autopoint} Program
++* po-fetch:: Invoking the @code{po-fetch} Program
Other Programming Languages
-@@ -480,15 +480,15 @@ sh - Shell Script
+@@ -496,15 +496,15 @@ sh - Shell Script
* Preparing for gettext.sh:: Preparing Shell Scripts for the @code{gettext.sh} approach
* Preparing for printf:: Preparing Shell Scripts for the @code{printf} approach
* Preparing for printf_gettext:: Preparing Shell Scripts for the @code{printf_gettext} approach
@@ -160,7 +172,7 @@
Perl
-@@ -1069,7 +1069,7 @@ contains all original program strings.
+@@ -1085,7 +1085,7 @@ contains all original program strings.
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.
@@ -169,7 +181,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
-@@ -1144,7 +1144,7 @@ obsolete, in @file{@var{lang}.po}, those
+@@ -1160,7 +1160,7 @@ obsolete, in @file{@var{lang}.po}, those
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
@@ -178,7 +190,7 @@
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -1168,8 +1168,8 @@ distribution.
+@@ -1184,8 +1184,8 @@ distribution.
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
@@ -189,7 +201,7 @@
for the @code{msgfmt} program.
Finally, the modified and marked C sources are compiled and linked
-@@ -1711,7 +1711,7 @@ string happens to look like a C format s
+@@ -1727,7 +1727,7 @@ string happens to look like a C format s
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.
@@ -198,7 +210,7 @@
@item objc-format
@kwindex objc-format at r{ flag}
-@@ -3302,7 +3302,7 @@ to use must contain the string @code{xge
+@@ -3328,7 +3328,7 @@ to use must contain the string @code{xge
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
@@ -207,7 +219,7 @@
used for solving this problem.
@node Special cases
-@@ -3334,7 +3334,7 @@ Consider the following case:
+@@ -3360,7 +3360,7 @@ Consider the following case:
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
@@ -216,7 +228,7 @@
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -3364,8 +3364,7 @@ from the array. So one solution can loo
+@@ -3390,8 +3390,7 @@ from the array. So one solution can loo
Please convince yourself that the string which is written by
@code{fputs} is translated in any case. How to get @code{xgettext} know
@@ -226,7 +238,7 @@
The above is of course not the only solution. You could also come along
with the following one:
-@@ -3668,11 +3667,11 @@ was fuzzy, and the suffix @samp{.pot} wa
+@@ -3694,11 +3693,11 @@ was fuzzy, and the suffix @samp{.pot} wa
@c FIXME: Rewrite.
@menu
@@ -240,8 +252,8 @@
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -3757,11 +3756,11 @@ To do so, the translator copies @file{@v
- the header entry of this file.
+@@ -3801,11 +3800,11 @@ and @code{mv @var{lang}.new.po @var{lang
+ @end itemize
@menu
-* msginit Invocation:: Invoking the @code{msginit} Program
@@ -254,7 +266,7 @@
@section Invoking the @code{msginit} Program
@include msginit.texi
-@@ -3994,10 +3993,10 @@ format of the plural forms field is desc
+@@ -4038,10 +4037,10 @@ format of the plural forms field is desc
@chapter Updating Existing PO Files
@menu
@@ -267,7 +279,22 @@
@section Invoking the @code{msgmerge} Program
@include msgmerge.texi
-@@ -5660,67 +5659,67 @@ sufficient, a library @samp{libgettextpo
+@@ -4134,12 +4133,12 @@ If you are running @code{ollama} in a vi
+ make the port 11434 accessible through port forwarding.
+ @end itemize
+
+- at node msgpre Invocation
++ at node msgpre
+ @section Invoking the @code{msgpre} Program
+
+ @include msgpre.texi
+
+- at node spit Invocation
++ at node spit
+ @section Invoking the @code{spit} Program
+
+ @include spit.texi
+@@ -5802,67 +5801,67 @@ sufficient, a library @samp{libgettextpo
write other specialized programs that process PO files.
@menu
@@ -355,7 +382,7 @@
@section Invoking the @code{msgexec} Program
@include msgexec.texi
-@@ -6667,17 +6666,17 @@ the inclusion of @samp{<gettext-po.h>}.
+@@ -6902,17 +6901,17 @@ the inclusion of @samp{<gettext-po.h>}.
@c FIXME: Rewrite.
@menu
@@ -377,7 +404,7 @@
@section Invoking the @code{msgunfmt} Program
@include msgunfmt.texi
-@@ -7632,7 +7631,7 @@ below). at footnote{Additions are welcome.
+@@ -7867,7 +7866,7 @@ below). at footnote{Additions are welcome.
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
@@ -386,7 +413,7 @@
@table @asis
@item Only one form:
-@@ -8715,7 +8714,7 @@ for changes.
+@@ -8950,7 +8949,7 @@ for changes.
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
@@ -394,8 +421,8 @@
+* gettextize:: Invoking the @code{gettextize} Program
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
- * Version Control Issues::
-@@ -8832,7 +8831,7 @@ Teams ought to settle their problems the
+ * Interfacing with the Translators::
+@@ -9068,7 +9067,7 @@ Teams ought to settle their problems the
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.
@@ -404,7 +431,16 @@
@section Invoking the @code{gettextize} Program
@include gettextize.texi
-@@ -8998,7 +8997,7 @@ GUI programs. To enable it, similarly a
+@@ -9177,7 +9176,7 @@ In packages where the translations are c
+ it uses a @code{po-fetch} invocation.
+ See @ref{Translations under Version Control?}
+ for this script's relation to version control,
+-and see @ref{po-fetch Invocation} for the possible arguments.
++and see @ref{po-fetch} for the possible arguments.
+ @end itemize
+
+ @cindex @code{fetch-po} target
+@@ -9278,7 +9277,7 @@ GUI programs. To enable it, similarly a
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
@@ -413,7 +449,7 @@
@node configure.ac
@subsection @file{configure.ac} at top level
-@@ -9461,7 +9460,7 @@ GNU @code{gettext} installs macros for u
+@@ -9741,7 +9740,7 @@ GNU @code{gettext} installs macros for u
In order to copy these macros into your package,
use the @code{gettextize} or @code{autopoint} programs.
@@ -422,7 +458,7 @@
Attempts to use the @code{autoreconf} program for this purpose are unreliable.
The primary macro is, of course, @code{AM_GNU_GETTEXT}.
-@@ -9640,7 +9639,7 @@ AM_XGETTEXT_OPTION([--flag=error_at_line
+@@ -9920,7 +9919,7 @@ AM_XGETTEXT_OPTION([--flag=error_at_line
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}.
@@ -431,16 +467,18 @@
accepts.
The use of this macro is an alternative to the use of the
-@@ -9710,7 +9709,7 @@ version controlled files.
- * Distributed Development:: Avoiding version mismatch in distributed development
+@@ -10028,8 +10027,8 @@ version controlled files.
* Files under Version Control:: Files to put under version control
- * Translations under Version Control:: Put PO Files under Version Control
+ * PO Template File under Version Control?:: Put the POT File under Version Control?
+ * Translations under Version Control?:: Put PO Files under Version Control?
-* autopoint Invocation:: Invoking the @code{autopoint} Program
+-* po-fetch Invocation:: Invoking the @code{po-fetch} Program
+* autopoint:: Invoking the @code{autopoint} Program
++* po-fetch:: Invoking the @code{po-fetch} Program
@end menu
@node Distributed Development
-@@ -9881,7 +9880,7 @@ recover the location comments by running
+@@ -10234,12 +10233,12 @@ the developers will be using the PO file
@end itemize
@@ -449,7 +487,13 @@
@subsection Invoking the @code{autopoint} Program
@include autopoint.texi
-@@ -11207,7 +11206,7 @@ by a program.
+
+- at node po-fetch Invocation
++ at node po-fetch
+ @subsection Invoking the @code{po-fetch} Program
+
+ @include po-fetch.texi
+@@ -11634,7 +11633,7 @@ by a program.
@item
Or the translated strings can be merged back to the original XML document.
To do this use the @code{msgfmt} program with the option @code{--xml}.
@@ -458,7 +502,7 @@
the @samp{msgfmt} program.
During this merge from a PO file into an XML file, it may happen that
-@@ -11438,7 +11437,7 @@ translators' PO files, through @code{msg
+@@ -11865,7 +11864,7 @@ translators' PO files, through @code{msg
@subsection XML files
See the section @ref{Preparing ITS Rules} and
diff --git a/gettext-killkillkill.patch b/gettext-killkillkill.patch
index 7352eb7..bbc60ce 100644
--- a/gettext-killkillkill.patch
+++ b/gettext-killkillkill.patch
@@ -1,6 +1,5 @@
-diff -Nru gettext-0.12/gettext-tools/misc/gettextize.in gettext-0.12.orig/gettext-tools/misc/gettextize.in
---- gettext-0.12.orig/gettext-tools/misc/gettextize.in 2003-05-08 22:41:15.000000000 +0200
-+++ gettext-0.12/gettext-tools/misc/gettextize.in 2003-05-20 14:30:03.000000000 +0200
+--- gettext-0.12.orig/gettext-tools/wizard/gettextize.in 2003-05-08 22:41:15.000000000 +0200
++++ gettext-0.12/gettext-tools/wizard/gettextize.in 2003-05-20 14:30:03.000000000 +0200
@@ -1052,10 +1052,6 @@
5) count="five paragraphs";;
*) count="$count paragraphs";;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/89774f1445fade6addb2fef8e2a4db9cfec1d06d
More information about the pld-cvs-commit
mailing list