[packages/gettext] - updated to 0.25
qboosh
qboosh at pld-linux.org
Thu May 15 18:21:31 CEST 2025
commit 33be502ec79f8ca13201011cf8001e59d727d0b7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 15 17:57:28 2025 +0200
- updated to 0.25
gettext-info.patch | 57 ++++++++++++++++++--------------
gettext.spec | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 128 insertions(+), 26 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index bd28697..498524c 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -2,9 +2,11 @@
# Conditional build:
%bcond_without asprintf # libasprintf C++ library
%bcond_with xemacs # po-mode for xemacs
+%bcond_without d # D support
%bcond_without java # convenience bcond to disable Java (any)
%bcond_with gcj # Java support by gcj (preferred over javac)
%bcond_without javac # Java support by some javac
+%bcond_without modula2 # Modula-2 support
%bcond_without dotnet # .NET support package
%bcond_with bootstrap # no system GLib, libcroco, libxml2 (for bootstrap)
@@ -38,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.24.1
+Version: 0.25
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: 3b2977dc0750b94acda565e280e7591f
+# Source0-md5: 7c1ab3685b9ec8da9b0d35f5caf75b2e
Patch0: %{name}-info.patch
Patch1: %{name}-killkillkill.patch
Patch3: %{name}-libdir.patch
@@ -51,7 +53,10 @@ 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)
+%{?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}
@@ -322,6 +327,20 @@ Static libtextstyle library.
%description -n libtextstyle-static -l pl.UTF-8
Statyczna biblioteka libtextstyle.
+%package d-devel
+Summary: Development library for D programs internationalization
+Summary(pl.UTF-8): Biblioteka programistyczna do umiędzynarodowiania programów w języku D
+License: Boost v1.0
+Group: Development/Languages
+#Requires: d-compiler (dmd|gcc-d|ldc)
+
+%description d-devel
+Development library for D programs internationalization.
+
+%description d-devel -l pl.UTF-8
+Biblioteka programistyczna do umiędzynarodowiania programów w języku
+D.
+
%package java
Summary: Runtime classes for Java programs internationalization
Summary(pl.UTF-8): Klasy do uruchamiania umiędzynarodowionych programów w Javie
@@ -348,6 +367,47 @@ Development classes for Java programs internationalization.
%description java-devel -l pl.UTF-8
Klasy do umiędzynarodowiania programów w Javie dla programistów.
+%package m2
+Summary: Runtime library for Modula-2 programs internationalization
+Summary(pl.UTF-8): Biblioteka do uruchamiania umiędzynarodowionych programów w języku Modula-2
+License: LGPL v2.1+
+Group: Libraries
+
+%description m2
+Runtime classes for Java programs internationalization.
+
+%description m2 -l pl.UTF-8
+Klasy do uruchamiania umiędzynarodowionych programów w Javie.
+
+%package m2-devel
+Summary: Development library for Modula-2 programs internationalization
+Summary(pl.UTF-8): Biblioteka programistyczna do umiędzynarodowiania programów w języku Modula-2
+License: LGPL v2.1+
+Group: Development/Libraries
+Requires: %{name}-m2 = %{version}-%{release}
+Requires: gcc-m2
+
+%description m2-devel
+Development library for Modula-2 programs internationalization.
+
+%description m2-devel -l pl.UTF-8
+Biblioteka programistyczna do umiędzynarodowiania programów w języku
+Modula-2.
+
+%package m2-static
+Summary: Static library for Modula-2 programs internationalization
+Summary(pl.UTF-8): Biblioteka statyczna do umiędzynarodowiania programów w języku Modula-2
+License: LGPL v2.1+
+Group: Development/Libraries
+Requires: %{name}-m2-devel = %{version}-%{release}
+
+%description m2-static
+Static library for Modula-2 programs internationalization.
+
+%description m2-static -l pl.UTF-8
+Biblioteka statyczna do umiędzynarodowiania programów w języku
+Modula-2.
+
%package -n xemacs-po-mode-pkg
Summary: Xemacs PO-mode
Summary(es.UTF-8): Facilita la edición de archivos PO (internacionalización) con emacs
@@ -470,9 +530,11 @@ cd ../..
%{?with_xemacs:--with-lispdir=%{_datadir}/xemacs-packages/lisp/po-mode} \
%{!?with_xemacs:--without-emacs} \
--enable-csharp=%{?with_dotnet:mono}%{!?with_dotnet:no} \
+ %{!?with_d:--disable-d} \
%if !%{build_java}
--disable-java \
%endif
+ %{!?with_modula2:--disable-modula2} \
--enable-nls \
--disable-silent-rules \
--without-bzip2 \
@@ -552,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libtextstyle-devel -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
+%post m2 -p /sbin/ldconfig
+%postun m2 -p /sbin/ldconfig
+
%files -f %{name}-runtime.lang
%defattr(644,root,root,755)
%attr(755,root,root) /bin/gettext
@@ -695,6 +760,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libtextstyle.a
+%if %{with d}
+%files d-devel
+%{_libdir}/libintl_d.a
+# XXX: shared (dmd, ...)
+%dir %{_includedir}/d
+%dir %{_includedir}/d/gnu
+%{_includedir}/d/gnu/libintl
+%endif
+
%if %{build_java}
%files java
%defattr(644,root,root,755)
@@ -712,6 +786,25 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gettext/javaversion.class
%endif
+%if %{with modula2}
+%files m2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libintl_m2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libintl_m2.so.0
+
+%files m2-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libintl_m2.so
+%{_libdir}/libintl_m2.la
+# XXX: common dir for Modula-2 headers
+%dir %{_includedir}/m2
+%{_includedir}/m2/Libintl.def
+
+%files m2-static
+%defattr(644,root,root,755)
+%{_libdir}/libintl_m2.a
+%endif
+
%if %{with xemacs}
%files -n xemacs-po-mode-pkg
%defattr(644,root,root,755)
diff --git a/gettext-info.patch b/gettext-info.patch
index be0afac..2d6c2f1 100644
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,5 +1,5 @@
---- gettext-0.23/gettext-tools/doc/gettext.texi.orig 2024-11-27 22:24:29.000000000 +0100
-+++ gettext-0.23/gettext-tools/doc/gettext.texi 2024-12-29 21:27:20.011680580 +0100
+--- gettext-0.25/gettext-tools/doc/gettext.texi.orig 2025-05-07 18:18:48.000000000 +0200
++++ gettext-0.25/gettext-tools/doc/gettext.texi 2025-05-15 16:11:37.338562204 +0200
@@ -59,30 +59,30 @@
@include version.texi
@@ -131,7 +131,7 @@
Other Programming Languages
-@@ -455,13 +455,13 @@ sh - Shell Script
+@@ -463,13 +463,13 @@ sh - Shell Script
* Preparing Shell Scripts:: Preparing Shell Scripts for Internationalization
* gettext.sh:: Contents of @code{gettext.sh}
@@ -152,7 +152,7 @@
Perl
-@@ -1042,7 +1042,7 @@ contains all original program strings.
+@@ -1050,7 +1050,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.
@@ -161,7 +161,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
-@@ -1117,7 +1117,7 @@ obsolete, in @file{@var{lang}.po}, those
+@@ -1125,7 +1125,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
@@ -170,7 +170,7 @@
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -1141,8 +1141,8 @@ distribution.
+@@ -1149,8 +1149,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
@@ -181,7 +181,7 @@
for the @code{msgfmt} program.
Finally, the modified and marked C sources are compiled and linked
-@@ -1605,7 +1605,7 @@ string happens to look like a C format s
+@@ -1637,7 +1637,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.
@@ -190,7 +190,7 @@
@item objc-format
@kwindex objc-format at r{ flag}
-@@ -3049,7 +3049,7 @@ to use must contain the string @code{xge
+@@ -3126,7 +3126,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
@@ -199,7 +199,7 @@
used for solving this problem.
@node Special cases
-@@ -3081,7 +3081,7 @@ Consider the following case:
+@@ -3158,7 +3158,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
@@ -208,7 +208,7 @@
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -3111,8 +3111,7 @@ from the array. So one solution can loo
+@@ -3188,8 +3188,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
@@ -218,7 +218,7 @@
The above is of course not the only solution. You could also come along
with the following one:
-@@ -3415,11 +3414,11 @@ was fuzzy, and the suffix @samp{.pot} wa
+@@ -3492,11 +3491,11 @@ was fuzzy, and the suffix @samp{.pot} wa
@c FIXME: Rewrite.
@menu
@@ -232,7 +232,7 @@
@section Invoking the @code{xgettext} Program
@include xgettext.texi
-@@ -3504,11 +3503,11 @@ To do so, the translator copies @file{@v
+@@ -3581,11 +3580,11 @@ To do so, the translator copies @file{@v
the header entry of this file.
@menu
@@ -246,7 +246,7 @@
@section Invoking the @code{msginit} Program
@include msginit.texi
-@@ -3745,10 +3744,10 @@ format of the plural forms field is desc
+@@ -3818,10 +3817,10 @@ format of the plural forms field is desc
@chapter Updating Existing PO Files
@menu
@@ -259,7 +259,7 @@
@section Invoking the @code{msgmerge} Program
@include msgmerge.texi
-@@ -5411,67 +5410,67 @@ sufficient, a library @samp{libgettextpo
+@@ -5484,67 +5483,67 @@ sufficient, a library @samp{libgettextpo
write other specialized programs that process PO files.
@menu
@@ -347,7 +347,7 @@
@section Invoking the @code{msgexec} Program
@include msgexec.texi
-@@ -6418,17 +6417,17 @@ the inclusion of @samp{<gettext-po.h>}.
+@@ -6491,17 +6490,17 @@ the inclusion of @samp{<gettext-po.h>}.
@c FIXME: Rewrite.
@menu
@@ -369,7 +369,7 @@
@section Invoking the @code{msgunfmt} Program
@include msgunfmt.texi
-@@ -7364,7 +7363,7 @@ below). at footnote{Additions are welcome.
+@@ -7456,7 +7455,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
@@ -378,7 +378,7 @@
@table @asis
@item Only one form:
-@@ -8447,7 +8446,7 @@ for changes.
+@@ -8539,7 +8538,7 @@ for changes.
@menu
* Flat and Non-Flat:: Flat or Non-Flat Directory Structures
* Prerequisites:: Prerequisite Works
@@ -387,7 +387,7 @@
* Adjusting Files:: Files You Must Create or Alter
* autoconf macros:: Autoconf macros for use in @file{configure.ac}
* Version Control Issues::
-@@ -8564,7 +8563,7 @@ Teams ought to settle their problems the
+@@ -8656,7 +8655,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.
@@ -396,7 +396,7 @@
@section Invoking the @code{gettextize} Program
@include gettextize.texi
-@@ -8730,7 +8729,7 @@ GUI programs. To enable it, similarly a
+@@ -8822,7 +8821,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
@@ -405,7 +405,16 @@
@node configure.ac
@subsection @file{configure.ac} at top level
-@@ -9362,7 +9361,7 @@ AM_XGETTEXT_OPTION([--flag=error_at_line
+@@ -9285,7 +9284,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.
+-See @ref{gettextize Invocation} or @ref{autopoint Invocation}.
++See @ref{gettextize} or @ref{autopoint}.
+ Attempts to use the @code{autoreconf} program for this purpose are unreliable.
+
+ The primary macro is, of course, @code{AM_GNU_GETTEXT}.
+@@ -9464,7 +9463,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}.
@@ -414,7 +423,7 @@
accepts.
The use of this macro is an alternative to the use of the
-@@ -9432,7 +9431,7 @@ version controlled files.
+@@ -9534,7 +9533,7 @@ version controlled files.
* 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
@@ -423,7 +432,7 @@
@end menu
@node Distributed Development
-@@ -9603,7 +9602,7 @@ recover the location comments by running
+@@ -9705,7 +9704,7 @@ recover the location comments by running
@end itemize
@@ -432,7 +441,7 @@
@subsection Invoking the @code{autopoint} Program
@include autopoint.texi
-@@ -10729,7 +10728,7 @@ by a program.
+@@ -10939,7 +10938,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}.
@@ -441,7 +450,7 @@
the @samp{msgfmt} program.
During this merge from a PO file into an XML file, it may happen that
-@@ -10960,7 +10959,7 @@ translators' PO files, through @code{msg
+@@ -11170,7 +11169,7 @@ translators' PO files, through @code{msg
@subsection XML files
See the section @ref{Preparing ITS Rules} and
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/33be502ec79f8ca13201011cf8001e59d727d0b7
More information about the pld-cvs-commit
mailing list