Compare commits
140 Commits
gettext-0_
...
rawhide
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | aa54659070 | |
Sundeep Anand | 7aca11f7d4 | |
Sundeep Anand | e09fc9f993 | |
Sundeep Anand | adb95f5020 | |
Sundeep Anand | b032e270f1 | |
Sundeep Anand | 4dc394f969 | |
Fedora Release Engineering | 8faf137723 | |
Jens Petersen | 43488c9689 | |
Jens Petersen | 2dabab53d8 | |
Sundeep Anand | 59393a0772 | |
Sundeep Anand | 7036fc870c | |
Sundeep Anand | 205b2f420a | |
Sundeep Anand | 419fa91470 | |
Jens Petersen | be4c5c778b | |
Sundeep Anand | b217c073ed | |
Sundeep Anand | 7d0cd2d7e2 | |
Fedora Release Engineering | b2e6e951dc | |
Sundeep Anand | fe68ad1d54 | |
Jens Petersen | fd237eb4df | |
Fedora Release Engineering | 757ca1de4b | |
Florian Weimer | 8b2ebf94ec | |
Sundeep Anand | 5412b38944 | |
Sundeep Anand | 1b17af56ab | |
Robert Scheck | 685e15bd65 | |
Fedora Release Engineering | 3d2b5ea009 | |
Tom Stellard | 8c125f4d85 | |
Sundeep Anand | 26b1c1422c | |
Jens Petersen | e3ec4313fc | |
Jens Petersen | 306be9bb5f | |
Jens Petersen | 7581bbfd34 | |
Sundeep Anand | 9a741fcbe0 | |
Fedora Release Engineering | 78951b9743 | |
Bastien Nocera | 802fdef835 | |
Bastien Nocera | 9aa0b07ad5 | |
Michael Catanzaro | 093dcc4088 | |
Fedora Release Engineering | 5077e71eb3 | |
Sundeep Anand | 58556efb97 | |
Sundeep Anand | 2c0418a6cc | |
Fedora Release Engineering | 15ad2cff3c | |
Sundeep Anand | 0c963d926a | |
Daiki Ueno | eca5567f1c | |
Sundeep Anand | f06c2682ab | |
Jens Petersen | 76b502edb8 | |
Igor Gnatenko | 35c094b5df | |
Fedora Release Engineering | 2b1ba2ed02 | |
Fedora Release Engineering | 7f499dbd3e | |
Tim Landscheidt | f20882a98a | |
Fedora Release Engineering | 1658f67fda | |
Igor Gnatenko | e3e0ce8d2e | |
Pavel Raiskup | c0dfab13cf | |
Pavel Raiskup | 537c7adbc7 | |
Pavel Raiskup | 7a9956c8de | |
Florian Weimer | 1336916058 | |
Igor Gnatenko | b6c84e55be | |
Fedora Release Engineering | fcdd3f123c | |
Bruno Goncalves | 25c66aad7e | |
Fedora Release Engineering | 3f0eb2ac03 | |
Igor Gnatenko | 45cef0410e | |
Pavel Raiskup | 94b4cda3bc | |
Fedora Release Engineering | 406636f46b | |
Fedora Release Engineering | 811ad124b4 | |
Kalev Lember | df49873324 | |
Fedora Release Engineering | ba3fa18f08 | |
Pavel Raiskup | 83c226dd02 | |
Pavel Raiskup | 63036c0a24 | |
Miro Hrončok | ddb59afae7 | |
Pavel Raiskup | 36a68602a1 | |
Petr Šabata | d64c699a89 | |
Pavel Raiskup | 05e2be0718 | |
Daiki Ueno | 25b3100aef | |
Daiki Ueno | 2030f3bb50 | |
Daiki Ueno | 92844b883b | |
Daiki Ueno | a3cc45e597 | |
Dennis Gilmore | 17122267b3 | |
Daiki Ueno | 8cd9f56f8c | |
Daiki Ueno | e49d0ca96d | |
Daiki Ueno | 53c2055406 | |
Daiki Ueno | 7467a073a4 | |
Jaromir Capik | 5737c1ce8d | |
Daiki Ueno | c772d8ea58 | |
Daiki Ueno | 2f170da402 | |
Daiki Ueno | d16a4b1630 | |
Daiki Ueno | 29385214e3 | |
Daiki Ueno | 4d1fd9cc69 | |
Dennis Gilmore | f5fb4fd3e6 | |
Kalev Lember | 99ef669afc | |
Till Maas | 1e22ea787c | |
Daiki Ueno | 56dcfb3d5d | |
Daiki Ueno | a5df21e81d | |
Daiki Ueno | da13e3807d | |
Peter Robinson | 3988706b40 | |
Daiki Ueno | d5e533acc8 | |
Daiki Ueno | 32c7ad1986 | |
Daiki Ueno | ec75cf4e8a | |
Dennis Gilmore | 83b4c21414 | |
Peter Robinson | fe5411f0b3 | |
Daiki Ueno | 38f29f9133 | |
Daiki Ueno | 5a1ae756c6 | |
Daiki Ueno | 81750ca123 | |
Daiki Ueno | 560376d784 | |
Daiki Ueno | 8cabc36496 | |
Dennis Gilmore | 6229f21243 | |
Daiki Ueno | f59f2fe383 | |
Daiki Ueno | 991bf5f363 | |
Daiki Ueno | 15ef493c43 | |
Daiki Ueno | a292e5048d | |
Daiki Ueno | 7c25fc7f25 | |
Dennis Gilmore | 4ef529bb47 | |
Daiki Ueno | f2232a9e2a | |
Daiki Ueno | 85c836422d | |
Daiki Ueno | 43d07a7c80 | |
Daiki Ueno | 4b40d5581d | |
Dennis Gilmore | 32ece58848 | |
Daiki Ueno | 8a2f464e7f | |
Jens Petersen | 62265d022a | |
Jens Petersen | 42f60e1101 | |
Jens Petersen | bc338ba2db | |
Jens Petersen | 5ea031c7fe | |
Dennis Gilmore | f9fc870677 | |
Jens Petersen | 36d5ee4e79 | |
Jens Petersen | feb72963e5 | |
Jens Petersen | f166fbd5b3 | |
Harald Hoyer | 9c9f4d13f0 | |
Harald Hoyer | e52ad18890 | |
Nils Philippsen | ee1992fe14 | |
Jens Petersen | a8429d710a | |
Jens Petersen | 0d49b3fc37 | |
Dennis Gilmore | 519c6c9021 | |
Dennis Gilmore | 5f73aa2140 | |
Jens Petersen | 7ed4974359 | |
Jens Petersen | 5d0888d8a4 | |
Jens Petersen | ed8b437b5f | |
Jens Petersen | d44c0861b4 | |
Jens Petersen | ba0543915a | |
Fedora Release Engineering | 180c5222dd | |
Jens Petersen | a9bfcf6a23 | |
Jens Petersen | 3b767ca68c | |
Jens Petersen | ba5423c403 | |
Jens Petersen | 4a263df8ea | |
Jens Petersen | c287fcbd72 |
|
@ -1 +0,0 @@
|
|||
gettext-0.17.tar.gz
|
|
@ -0,0 +1 @@
|
|||
/gettext-0.*.tar.*
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: gettext
|
||||
# $Id: Makefile,v 1.3 2008/02/17 23:51:29 petersen Exp $
|
||||
NAME := gettext
|
||||
SPECFILE = gettext.spec
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -0,0 +1,9 @@
|
|||
#requires bison
|
||||
#requires libtool
|
||||
|
||||
mcd $BUILDDIR/gettext
|
||||
|
||||
$SRC/gettext-*/configure $TCONFIGARGS --disable-static --enable-shared --with-pic-=yes --disable-csharp --disable-rpath
|
||||
|
||||
make $J
|
||||
make $J install
|
|
@ -1,24 +0,0 @@
|
|||
2008-04-20 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* autopoint.in: Check that really all CVS directories are removed.
|
||||
Reported by Jim Meyering <jim@meyering.net>.
|
||||
|
||||
*** gettext-tools/misc/autopoint.in 18 Jan 2008 23:30:16 -0000 1.37
|
||||
--- gettext-tools/misc/autopoint.in 20 Apr 2008 06:06:07 -0000
|
||||
***************
|
||||
*** 426,431 ****
|
||||
--- 426,438 ----
|
||||
cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
|
||||
(cvs checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
|
||||
find archive -name CVS -type d -print | xargs rm -rf
|
||||
+ # Check that really all CVS directories are gone, otherwise we would overwrite
|
||||
+ # the contents of the user's CVS directories.
|
||||
+ if test `find archive -name CVS -type d -print | wc -l` != 0; then
|
||||
+ cd ..
|
||||
+ rm -rf "$cvs_dir" "$work_dir"
|
||||
+ func_fatal_error "failed to remove all CVS subdirectories"
|
||||
+ fi
|
||||
if test `find archive -type f -print | wc -l` = 0; then
|
||||
cd ..
|
||||
rm -rf "$cvs_dir" "$work_dir"
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
|
||||
--- ./gettext-runtime/libasprintf/configure.ac.~ 2007-10-08 05:37:36.000000000 +1000
|
||||
+++ ./gettext-runtime/libasprintf/configure.ac 2008-08-28 16:43:18.000000000 +1000
|
||||
@@ -54,7 +54,8 @@ dnl Checks for header files.
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_INLINE
|
||||
AC_TYPE_SIZE_T
|
||||
-gl_AC_TYPE_LONG_LONG
|
||||
+AC_TYPE_LONG_LONG_INT
|
||||
+#gl_AC_TYPE_LONG_LONG
|
||||
gt_TYPE_LONGDOUBLE
|
||||
gt_TYPE_WCHAR_T
|
||||
gt_TYPE_WINT_T
|
|
@ -1,25 +0,0 @@
|
|||
2007-11-07 Jim Meyering <meyering@redhat.com>
|
||||
Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* write-catalog.c (msgdomain_list_print): Fix open() call.
|
||||
|
||||
--- gettext-tools/src/write-catalog.c 7 Oct 2007 19:35:31 -0000 1.4
|
||||
+++ gettext-tools/src/write-catalog.c 7 Nov 2007 11:43:15 -0000
|
||||
@@ -1,5 +1,5 @@
|
||||
/* GNU gettext - internationalization aids
|
||||
- Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -220,7 +220,9 @@
|
||||
/* Open the output file. */
|
||||
if (!to_stdout)
|
||||
{
|
||||
- fd = open (filename, O_WRONLY | O_CREAT);
|
||||
+ fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
|
||||
+ /* 0666 in portable POSIX notation: */
|
||||
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
|
||||
if (fd < 0)
|
||||
{
|
||||
const char *errno_description = strerror (errno);
|
|
@ -1,107 +0,0 @@
|
|||
diff -up ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ ./gettext-tools/gnulib-tests/Makefile.gnulib
|
||||
--- ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ 2007-10-28 01:39:18.000000000 +1000
|
||||
+++ ./gettext-tools/gnulib-tests/Makefile.gnulib 2008-08-28 16:43:18.000000000 +1000
|
||||
@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I ../gnulib-m4
|
||||
|
||||
SUBDIRS =
|
||||
TESTS =
|
||||
-TESTS_ENVIRONMENT =
|
||||
+TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:'
|
||||
noinst_PROGRAMS =
|
||||
check_PROGRAMS =
|
||||
noinst_HEADERS =
|
||||
diff -up ./gettext-tools/tests/Makefile.am.rpathFix~ ./gettext-tools/tests/Makefile.am
|
||||
--- ./gettext-tools/tests/Makefile.am.rpathFix~ 2007-10-21 07:54:40.000000000 +1000
|
||||
+++ ./gettext-tools/tests/Makefile.am 2008-08-28 16:43:18.000000000 +1000
|
||||
@@ -181,6 +181,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_src
|
||||
LOCALE_JA='@LOCALE_JA@' \
|
||||
host_os='@host_os@' \
|
||||
CONFIG_SHELL='$(SHELL)' \
|
||||
+ LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:' \
|
||||
$(SHELL)
|
||||
|
||||
xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
|
||||
diff -up ./m4/libtool.m4.rpathFix~ ./m4/libtool.m4
|
||||
--- ./m4/libtool.m4.rpathFix~ 2007-10-27 10:46:10.000000000 +1000
|
||||
+++ ./m4/libtool.m4 2008-08-28 16:43:18.000000000 +1000
|
||||
@@ -1616,7 +1616,7 @@ linux* | k*bsd*-gnu)
|
||||
# This implies no fast_install, which is unacceptable.
|
||||
# Some rework will be needed to allow for fast_install
|
||||
# before this can be enabled.
|
||||
- hardcode_into_libs=yes
|
||||
+ #hardcode_into_libs=yes
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
@@ -2872,7 +2872,8 @@ if test "$GXX" = yes; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
||||
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
|
||||
# If archive_cmds runs LD, not CC, wlarc should be empty
|
||||
@@ -3340,7 +3341,8 @@ case $host_os in
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
||||
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
|
||||
# Archives containing C++ object files must be created using
|
||||
@@ -3368,7 +3370,8 @@ case $host_os in
|
||||
;;
|
||||
esac
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
||||
;;
|
||||
@@ -3377,7 +3380,8 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
||||
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
|
||||
;;
|
||||
@@ -3387,7 +3391,8 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
|
||||
|
||||
runpath_var=LD_RUN_PATH
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
@@ -3584,8 +3589,9 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
||||
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
@@ -5582,7 +5588,8 @@ ifelse([$1],[CXX],[
|
||||
# are reset later if shared libraries are not supported. Putting them
|
||||
# here allows them to be overridden if necessary.
|
||||
runpath_var=LD_RUN_PATH
|
||||
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|
|
@ -0,0 +1,70 @@
|
|||
diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
|
||||
index 965cc8c..38c7ca1 100644
|
||||
--- a/gettext-tools/src/msgl-cat.c
|
||||
+++ b/gettext-tools/src/msgl-cat.c
|
||||
@@ -307,6 +307,7 @@ catenate_msgdomain_list (string_list_ty *file_list,
|
||||
mp->msgid);
|
||||
multiline_error (xstrdup (""),
|
||||
xasprintf ("%s\n", errormsg));
|
||||
+ free (errormsg);
|
||||
}
|
||||
}
|
||||
else
|
||||
diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
|
||||
index 13d4a53..669db2f 100644
|
||||
--- a/gettext-tools/src/x-csharp.c
|
||||
+++ b/gettext-tools/src/x-csharp.c
|
||||
@@ -561,6 +561,7 @@ comment_line_end (size_t chars_to_remove)
|
||||
buffer[buflen] = '\0';
|
||||
savable_comment_add (buffer);
|
||||
lexical_context = lc_outside;
|
||||
+ free (buffer);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
|
||||
index e89ab95..6c1b4a7 100644
|
||||
--- a/gettext-tools/src/x-java.c
|
||||
+++ b/gettext-tools/src/x-java.c
|
||||
@@ -461,6 +461,7 @@ comment_line_end (size_t chars_to_remove)
|
||||
--buflen;
|
||||
buffer[buflen] = '\0';
|
||||
savable_comment_add (buffer);
|
||||
+ free (buffer);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
|
||||
index cde1ee6..82f645f 100644
|
||||
--- a/gettext-tools/src/x-rst.c
|
||||
+++ b/gettext-tools/src/x-rst.c
|
||||
@@ -651,6 +651,8 @@ extract_rsj (FILE *f,
|
||||
else
|
||||
goto invalid_rsj;
|
||||
|
||||
+ free (s1);
|
||||
+
|
||||
/* Parse a comma. */
|
||||
c = phase2_getc ();
|
||||
if (c == '}')
|
||||
@@ -667,6 +669,7 @@ extract_rsj (FILE *f,
|
||||
|
||||
fp = NULL;
|
||||
real_file_name = NULL;
|
||||
+ free (logical_file_name);
|
||||
logical_file_name = NULL;
|
||||
line_number = 0;
|
||||
|
||||
diff --git a/gettext-tools/src/xg-arglist-callshape.c b/gettext-tools/src/xg-arglist-callshape.c
|
||||
index 06b7076..2189aac 100644
|
||||
--- a/gettext-tools/src/xg-arglist-callshape.c
|
||||
+++ b/gettext-tools/src/xg-arglist-callshape.c
|
||||
@@ -118,6 +118,7 @@ split_keywordspec (const char *spec,
|
||||
memcpy (xcomment, xcomment_start, xcomment_len);
|
||||
xcomment[xcomment_len] = '\0';
|
||||
string_list_append (&xcomments, xcomment);
|
||||
+ free (xcomment);
|
||||
}
|
||||
else
|
||||
break;
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 5a7184c..28267a5 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -19,7 +19,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
|
||||
+SUBDIRS = gnulib-local gettext-runtime gettext-tools
|
||||
|
||||
changelog_etc = \
|
||||
gettext-runtime/ChangeLog.0 \
|
||||
@@ -124,7 +124,6 @@ distcheck-hook:
|
||||
test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
|
||||
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
||||
cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
|
||||
- cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
|
||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
|
||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
|
||||
test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f4e54ea..ff850ae 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
dnl Checks for library functions.
|
||||
|
||||
-AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
|
||||
+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
|
||||
|
||||
AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
|
||||
|
||||
@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
|
||||
dnl Optional Features: AC_ARG_ENABLE calls
|
||||
dnl Optional Packages: AC_ARG_WITH calls
|
||||
dnl Some influential environment variables: AC_ARG_VAR calls
|
||||
-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
||||
+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
|
||||
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
|
||||
index 449a797..bce4ad8 100644
|
||||
--- a/gettext-tools/Makefile.am
|
||||
+++ b/gettext-tools/Makefile.am
|
||||
@@ -19,7 +19,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
||||
|
||||
-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||
+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||
|
||||
EXTRA_DIST = misc/DISCLAIM
|
||||
MOSTLYCLEANFILES = core *.stackdump
|
||||
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
|
||||
index 05ce0cf..936331c 100644
|
||||
--- a/gettext-tools/libgettextpo/textstyle.in.h
|
||||
+++ b/gettext-tools/libgettextpo/textstyle.in.h
|
||||
@@ -239,7 +239,8 @@ typedef ostream_t file_ostream_t;
|
||||
static inline file_ostream_t
|
||||
file_ostream_create (FILE *fp)
|
||||
{
|
||||
- return fp;
|
||||
+ /* Closing the stream we return should not close 'fp'. */
|
||||
+ return fdopen (dup (fileno (fp)), "w");
|
||||
}
|
||||
|
||||
/* --------------------------- From fd-ostream.h --------------------------- */
|
||||
@@ -439,6 +440,30 @@ html_styled_ostream_create (_GL_ATTRIBUTE_MAYBE_UNUSED ostream_t destination,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+/* ----------------------- From noop-styled-ostream.h ----------------------- */
|
||||
+
|
||||
+/* noop_styled_ostream_t is a subtype of ostream_t. */
|
||||
+typedef ostream_t noop_styled_ostream_t;
|
||||
+
|
||||
+#define noop_styled_ostream_write_mem ostream_write_mem
|
||||
+#define noop_styled_ostream_flush ostream_flush
|
||||
+#define noop_styled_ostream_free ostream_free
|
||||
+#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
|
||||
+#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
|
||||
+#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
|
||||
+#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
|
||||
+#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
|
||||
+#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
|
||||
+
|
||||
+static inline ostream_t
|
||||
+noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
|
||||
+{
|
||||
+ if (pass_ownership)
|
||||
+ return destination;
|
||||
+ else
|
||||
+ return fdopen (dup (fileno (destination)), "w");
|
||||
+}
|
||||
+
|
||||
/* ------------------------------ From color.h ------------------------------ */
|
||||
|
||||
#define color_test_mode false
|
||||
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
|
||||
index 510ab2a..72791ba 100644
|
||||
--- a/gettext-tools/src/Makefile.am
|
||||
+++ b/gettext-tools/src/Makefile.am
|
||||
@@ -291,19 +291,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
|
||||
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
|
||||
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
|
||||
|
||||
-if USE_INSTALLED_LIBTEXTSTYLE
|
||||
-LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
|
||||
-else
|
||||
-# How to get the include files of libtextstyle.
|
||||
-textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
|
||||
- here=`pwd`; \
|
||||
- cd ../../libtextstyle/lib && \
|
||||
- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
|
||||
-BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
||||
-MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
||||
-# Where to find the built libtextstyle library.
|
||||
-LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
|
||||
-endif
|
||||
+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
|
||||
+LT_LIBTEXTSTYLE =
|
||||
+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
|
||||
|
||||
# How to build libgettextsrc.la.
|
||||
# Need ../gnulib-lib/libgettextlib.la.
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c gettext-0.21/gettext-tools/gnulib-lib/javacomp.c
|
||||
--- gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c 2022-03-09 12:22:05.000000000 +0900
|
||||
+++ gettext-0.21/gettext-tools/gnulib-lib/javacomp.c 2022-03-20 18:23:53.636052943 +0900
|
||||
@@ -116,9 +116,8 @@ default_target_version (void)
|
||||
&& (java_version_cache[1] >= '2'
|
||||
&& java_version_cache[1] <= '7')
|
||||
&& java_version_cache[2] == '\0')
|
||||
- /* Assume that these (not yet released) Java versions will behave
|
||||
- like the preceding ones. */
|
||||
- java_version_cache = "11";
|
||||
+ /* It's one of the valid target version values. */
|
||||
+ ;
|
||||
else
|
||||
java_version_cache = "1.1";
|
||||
}
|
||||
@@ -128,7 +127,7 @@ default_target_version (void)
|
||||
/* ======================= Source version dependent ======================= */
|
||||
|
||||
/* Convert a source version to an index. */
|
||||
-#define SOURCE_VERSION_BOUND 8 /* exclusive upper bound */
|
||||
+#define SOURCE_VERSION_BOUND 14 /* exclusive upper bound */
|
||||
static unsigned int
|
||||
source_version_index (const char *source_version)
|
||||
{
|
||||
@@ -144,7 +143,7 @@ source_version_index (const char *source
|
||||
else if (source_version[0] == '9' && source_version[1] == '\0')
|
||||
return 5;
|
||||
else if (source_version[0] == '1'
|
||||
- && (source_version[1] >= '0' && source_version[1] <= '1')
|
||||
+ && (source_version[1] >= '0' && source_version[1] <= '7')
|
||||
&& source_version[2] == '\0')
|
||||
return source_version[1] - '0' + 6;
|
||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
||||
@@ -171,6 +170,10 @@ get_goodcode_snippet (const char *source
|
||||
return "class conftest { public void m() { var i = new Integer(0); } }\n";
|
||||
if (strcmp (source_version, "11") == 0)
|
||||
return "class conftest { Readable r = (var b) -> 0; }\n";
|
||||
+ if (source_version[0] == '1'
|
||||
+ && (source_version[1] >= '2' && source_version[1] <= '7')
|
||||
+ && source_version[2] == '\0')
|
||||
+ return "class conftest { Readable r = (var b) -> 0; }\n";
|
||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
||||
return NULL;
|
||||
}
|
||||
@@ -197,6 +200,10 @@ get_failcode_snippet (const char *source
|
||||
return "class conftestfail { Readable r = (var b) -> 0; }\n";
|
||||
if (strcmp (source_version, "11") == 0)
|
||||
return NULL;
|
||||
+ if (source_version[0] == '1'
|
||||
+ && (source_version[1] >= '2' && source_version[1] <= '7')
|
||||
+ && source_version[2] == '\0')
|
||||
+ return NULL;
|
||||
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
|
||||
return NULL;
|
||||
}
|
||||
@@ -204,7 +211,7 @@ get_failcode_snippet (const char *source
|
||||
/* ======================= Target version dependent ======================= */
|
||||
|
||||
/* Convert a target version to an index. */
|
||||
-#define TARGET_VERSION_BOUND 11 /* exclusive upper bound */
|
||||
+#define TARGET_VERSION_BOUND 17 /* exclusive upper bound */
|
||||
static unsigned int
|
||||
target_version_index (const char *target_version)
|
||||
{
|
||||
@@ -215,7 +222,7 @@ target_version_index (const char *target
|
||||
else if (target_version[0] == '9' && target_version[1] == '\0')
|
||||
return 8;
|
||||
else if (target_version[0] == '1'
|
||||
- && (target_version[1] >= '0' && target_version[1] <= '1')
|
||||
+ && (target_version[1] >= '0' && target_version[1] <= '7')
|
||||
&& target_version[2] == '\0')
|
||||
return target_version[1] - '0' + 9;
|
||||
error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
|
||||
@@ -245,10 +252,10 @@ corresponding_classfile_version (const c
|
||||
return 52;
|
||||
if (strcmp (target_version, "9") == 0)
|
||||
return 53;
|
||||
- if (strcmp (target_version, "10") == 0)
|
||||
- return 54;
|
||||
- if (strcmp (target_version, "11") == 0)
|
||||
- return 55;
|
||||
+ if (target_version[0] == '1'
|
||||
+ && (target_version[1] >= '0' && target_version[1] <= '7')
|
||||
+ && target_version[2] == '\0')
|
||||
+ return target_version[1] + 54;
|
||||
error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
|
||||
return 0;
|
||||
}
|
||||
@@ -2439,7 +2446,7 @@ compile_java_class (const char * const *
|
||||
}
|
||||
}
|
||||
|
||||
- error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC"));
|
||||
+ /* error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC")); */
|
||||
err = true;
|
||||
|
||||
done2:
|
||||
diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/src/write-java.c gettext-0.21/gettext-tools/src/write-java.c
|
||||
--- gettext-0.21.orig/gettext-tools/src/write-java.c 2022-03-09 12:17:21.000000000 +0900
|
||||
+++ gettext-0.21/gettext-tools/src/write-java.c 2022-03-20 18:26:06.941734979 +0900
|
||||
@@ -1209,8 +1209,14 @@ msgdomain_write_java (message_list_ty *m
|
||||
Java compilers create the class files in the source file's directory -
|
||||
which is in a temporary directory in our case. */
|
||||
java_sources[0] = java_file_name;
|
||||
- if (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
|
||||
+ if (1
|
||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "17", "17", directory,
|
||||
+ true, false, true, verbose > 0)) /* assume JDK 17 */
|
||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "11", "11", directory,
|
||||
+ true, false, true, verbose > 0)) /* assume JDK 11 */
|
||||
+ && (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
|
||||
true, false, true, verbose > 0))
|
||||
+ )
|
||||
{
|
||||
if (!verbose)
|
||||
error (0, 0,
|
|
@ -1,23 +0,0 @@
|
|||
2008-08-03 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* x-python.c (mixed_string_buffer_append): Replace a lone high
|
||||
surrogate with U+FFFD.
|
||||
Reported by Yann <asterix@lagaule.org>
|
||||
via Santiago Vila <sanvila@unex.es>.
|
||||
|
||||
*** gettext-tools/src/x-python.c 20 Apr 2008 05:23:52 -0000 1.32
|
||||
--- gettext-tools/src/x-python.c 3 Aug 2008 19:56:58 -0000
|
||||
***************
|
||||
*** 930,935 ****
|
||||
--- 930,940 ----
|
||||
|
||||
if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00))
|
||||
bp->utf16_surr = UNICODE_VALUE (c);
|
||||
+ else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000))
|
||||
+ {
|
||||
+ /* A half surrogate is invalid, therefore use U+FFFD instead. */
|
||||
+ mixed_string_buffer_append_unicode (bp, 0xfffd);
|
||||
+ }
|
||||
else
|
||||
mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c));
|
||||
}
|
773
gettext.spec
773
gettext.spec
|
@ -1,20 +1,41 @@
|
|||
%bcond_without jar
|
||||
%bcond_without java
|
||||
%bcond_without check
|
||||
%bcond_with jar
|
||||
%bcond_with java
|
||||
|
||||
Summary: GNU libraries and utilities for producing multi-lingual messages
|
||||
Summary: GNU tools and libraries for localized translated messages
|
||||
Name: gettext
|
||||
Version: 0.17
|
||||
Release: 16%{?dist}
|
||||
License: GPLv3 and LGPLv2+
|
||||
Group: Development/Tools
|
||||
URL: http://www.gnu.org/software/gettext/
|
||||
Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
|
||||
Version: 0.21.1
|
||||
Release: 2%{?dist}
|
||||
|
||||
# The following are licensed under LGPLv2+:
|
||||
# - libintl and its headers
|
||||
# - libasprintf and its headers
|
||||
# - libintl.jar
|
||||
# - GNU.Gettext.dll
|
||||
# - gettext.sh
|
||||
# The following are licensed under GFDL:
|
||||
# - gettext-tools/doc/FAQ.html
|
||||
# - gettext-tools/doc/tutorial.html
|
||||
# - gettext info files
|
||||
# - libasprintf info files
|
||||
# - libtextstyle info files
|
||||
# Everything else is GPLv3+
|
||||
License: GPLv3+ and LGPLv2+ and GFDL
|
||||
URL: https://www.gnu.org/software/gettext/
|
||||
Source: https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
|
||||
Source2: msghack.py
|
||||
# removal of openmp.m4
|
||||
BuildRequires: autoconf >= 2.62
|
||||
Source3: msghack.1
|
||||
|
||||
Patch1: %{name}-%{version}-disable-libtextstyle.patch
|
||||
Patch2: %{name}-%{version}-covscan.patch
|
||||
Patch3: %{name}-java17-2062407.patch
|
||||
|
||||
# for bootstrapping
|
||||
# BuildRequires: autoconf >= 2.62
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool, bison, gcc-c++
|
||||
BuildRequires: libtool
|
||||
# BuildRequires: bison
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
%if %{with java}
|
||||
# libintl.jar requires gcj >= 4.3 to build
|
||||
BuildRequires: gcc-java, libgcj
|
||||
|
@ -26,18 +47,36 @@ BuildRequires: %{_bindir}/fastjar
|
|||
BuildRequires: zip, unzip
|
||||
%endif
|
||||
%endif
|
||||
# need expat for xgettext on glade
|
||||
Buildrequires: expat-devel
|
||||
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
# for autopoint:
|
||||
Requires: cvs
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
Patch5: gettext-0.17-open-args.patch
|
||||
Patch6: gettext-0.17-autopoint-CVS-441481.patch
|
||||
Patch7: gettext-0.17-rpathFix.patch
|
||||
Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
|
||||
Patch9: gettext-0.17-long-long-int-m4.patch
|
||||
# for po-mode.el
|
||||
BuildRequires: emacs
|
||||
# for autosetup
|
||||
BuildRequires: git
|
||||
# ensure 'ARCHIVE_FORMAT=dirxz'
|
||||
BuildRequires: xz
|
||||
# for documentation
|
||||
BuildRequires: teckit
|
||||
BuildRequires: texlive-dvips
|
||||
BuildRequires: texlive-dvipdfmx
|
||||
BuildRequires: texinfo-tex
|
||||
BuildRequires: texlive-xetex
|
||||
# following suggested by DEPENDENCIES:
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libunistring-devel
|
||||
# for the tests
|
||||
BuildRequires: glibc-langpack-de
|
||||
BuildRequires: glibc-langpack-en
|
||||
BuildRequires: glibc-langpack-fa
|
||||
BuildRequires: glibc-langpack-fr
|
||||
BuildRequires: glibc-langpack-ja
|
||||
BuildRequires: glibc-langpack-tr
|
||||
BuildRequires: glibc-langpack-zh
|
||||
BuildRequires: make
|
||||
Provides: bundled(gnulib)
|
||||
Provides: bundled(libcroco) = 0.6.12
|
||||
Requires: %{name}-runtime = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The GNU gettext package provides a set of tools and documentation for
|
||||
|
@ -52,15 +91,45 @@ catalogs and is a powerful and simple method for internationalizing
|
|||
programs.
|
||||
|
||||
|
||||
%package runtime
|
||||
Summary: GNU runtime libraries and programs for producing multi-lingual messages
|
||||
License: GPLv3+ and LGPLv2+
|
||||
# Depend on the exact version of the library sub package
|
||||
Requires: %{name}-libs%{_isa} = %{version}-%{release}
|
||||
Requires: %{name}-envsubst = %{version}-%{release}
|
||||
Conflicts: %{name} <= 0.21-15%{?dist}.0.20220203
|
||||
|
||||
|
||||
%description runtime
|
||||
The GNU gettext-runtime package provides an easy to use runtime libraries and
|
||||
programs for creating, using, and modifying natural language catalogs
|
||||
and is a powerful and simple method for internationalizing programs.
|
||||
|
||||
|
||||
%package common-devel
|
||||
Summary: Common development files for %{name}
|
||||
# autopoint archive
|
||||
License: GPLv3+
|
||||
BuildArch: noarch
|
||||
|
||||
%description common-devel
|
||||
This package contains common architecture independent gettext development files.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Tools
|
||||
License: LGPLv2+
|
||||
# autopoint is GPLv3+
|
||||
# libasprintf is LGPLv2+
|
||||
# libgettextpo is GPLv3+
|
||||
License: LGPLv2+ and GPLv3+ and GFDL
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
|
||||
Requires: %{name}-common-devel = %{version}-%{release}
|
||||
Requires: xz
|
||||
Requires: diffutils
|
||||
Obsoletes: gettext-autopoint < 0.18.1.1-3
|
||||
Provides: gettext-autopoint = %{version}-%{release}
|
||||
Obsoletes: libtextstyle-devel < %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains all development related files necessary for
|
||||
|
@ -71,60 +140,100 @@ want to add gettext support for your project.
|
|||
|
||||
%package libs
|
||||
Summary: Libraries for %{name}
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
# libasprintf is LGPLv2+
|
||||
# libgettextpo is GPLv3+
|
||||
License: LGPLv2+ and GPLv3+
|
||||
Obsoletes: libtextstyle < %{version}-%{release}
|
||||
|
||||
%description libs
|
||||
This package contains libraries used internationalization support.
|
||||
|
||||
|
||||
%package -n emacs-%{name}
|
||||
Summary: Support for editing po files within GNU Emacs
|
||||
BuildArch: noarch
|
||||
# help users find po-mode.el
|
||||
Provides: emacs-po-mode
|
||||
Requires: emacs(bin) >= %{_emacs_version}
|
||||
Provides: emacs-%{name}-el = %{version}-%{release}
|
||||
Obsoletes: emacs-%{name}-el < %{version}-%{release}
|
||||
|
||||
%description -n emacs-%{name}
|
||||
This package provides a major mode for editing po files within GNU Emacs.
|
||||
|
||||
%package -n msghack
|
||||
Summary: Alter PO files in ways
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n msghack
|
||||
This program can be used to alter .po files in ways no sane mind would
|
||||
think about.
|
||||
|
||||
|
||||
%package envsubst
|
||||
Summary: Substitutes the values of environment variables
|
||||
Conflicts: %{name} <= 0.21-15%{?dist}.0.20220203
|
||||
|
||||
%description envsubst
|
||||
Substitutes the values of environment variables.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch5 -p0 -b .5-open-args~
|
||||
%patch6 -p0 -b .6-autopoint~
|
||||
%patch7 -p0 -b .rpathFix~
|
||||
%patch8 -p0 -b .unicode~
|
||||
%patch9 -p0 -b .longlong~
|
||||
%autosetup -S git
|
||||
# Refresh autotools files to latest versions
|
||||
# Should be removed after 0.21:
|
||||
autoreconf --force --install
|
||||
|
||||
# necessary for autoconf >= 2.6.2:
|
||||
rm gettext-tools/gnulib-m4/openmp.m4
|
||||
|
||||
./autogen.sh --quick --skip-gnulib
|
||||
# Defeat libtextstyle attempt to bundle libxml2. The comments
|
||||
# indicate this is done because the libtextstyle authors do not want
|
||||
# applications using their code to suffer startup delays due to the
|
||||
# relocations. This is not a sufficient reason for Fedora.
|
||||
sed -e 's/\(gl_cv_libxml_force_included=\)yes/\1no/' \
|
||||
-i libtextstyle/configure
|
||||
|
||||
|
||||
%build
|
||||
[ -f %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
|
||||
|
||||
%if %{with java}
|
||||
export JAVAC=gcj
|
||||
%if %{with jar}
|
||||
export JAR=fastjar
|
||||
%endif
|
||||
%endif
|
||||
%configure --without-included-gettext --enable-nls --disable-static \
|
||||
--enable-shared --with-pic-=yes --disable-csharp \
|
||||
%ifarch ppc ppc64 ppc64le
|
||||
# prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
|
||||
export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
|
||||
%endif
|
||||
# Fedora's libxml2-devel package has an extra "libxml2" path component.
|
||||
export CPPFLAGS="-I%{_includedir}/libxml2"
|
||||
# Side effect of unbundling libxml2 from libtextstyle.
|
||||
export LIBS="-lxml2"
|
||||
%configure --enable-nls --disable-static \
|
||||
--enable-shared --disable-csharp --disable-rpath \
|
||||
%if %{with java}
|
||||
--enable-java \
|
||||
%else
|
||||
--disable-java --disable-native-java \
|
||||
%endif
|
||||
--disable-rpath
|
||||
make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
|
||||
--with-xz
|
||||
|
||||
# Eliminate hardcoded rpaths; workaround libtool reordering -Wl,--as-needed
|
||||
# after all the libraries.
|
||||
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
||||
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
||||
-e 's|CC=.g..|& -Wl,--as-needed|' \
|
||||
-i $(find . -name libtool)
|
||||
|
||||
%make_build %{?with_java:GCJFLAGS="-findirect-dispatch"}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
|
||||
lispdir=%{_datadir}/emacs/site-lisp \
|
||||
%make_install \
|
||||
lispdir=%{_datadir}/emacs/site-lisp/gettext \
|
||||
aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
|
||||
|
||||
# move gettext to /bin
|
||||
mkdir -p ${RPM_BUILD_ROOT}/bin
|
||||
mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
|
||||
ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
|
||||
|
||||
install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
|
||||
|
||||
install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_bindir}/msghack
|
||||
install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_mandir}/man1/msghack.1
|
||||
|
||||
# make preloadable_libintl.so executable
|
||||
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/preloadable_libintl.so
|
||||
|
@ -141,7 +250,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/examples
|
|||
|
||||
rm -rf htmldoc
|
||||
mkdir htmldoc
|
||||
mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/libasprintf/* htmldoc
|
||||
mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf/* htmldoc
|
||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
|
||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
||||
|
||||
|
@ -160,105 +269,125 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
|
|||
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
|
||||
|
||||
# remove unpackaged files from the buildroot
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/emacs
|
||||
# own this directory for third-party *.its files
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/its
|
||||
|
||||
# remove .la files
|
||||
rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
|
||||
|
||||
# remove internal .so lib files
|
||||
rm ${RPM_BUILD_ROOT}%{_libdir}/libgettext{src,lib}.so
|
||||
|
||||
# move po-mode initialization elisp file to the right place, and remove byte
|
||||
# compiled file
|
||||
install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
|
||||
mv ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.el ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
|
||||
rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
|
||||
|
||||
%find_lang %{name}-runtime
|
||||
%find_lang %{name}-tools
|
||||
cat %{name}-*.lang > %{name}.lang
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
## For Koji build problem
|
||||
cp ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/src/.libs
|
||||
cp ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/tests/.libs
|
||||
cp ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/src/.libs
|
||||
cp ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/tests/.libs
|
||||
# this takes quite a lot of time to run
|
||||
make check
|
||||
%endif
|
||||
|
||||
# adapt to rpath removal
|
||||
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$PWD/gettext-tools/intl/.libs
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
|
||||
# override LIBUNISTRING to prevent reordering of lib objects
|
||||
make check LIBUNISTRING=-lunistring
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
%preun
|
||||
if [ "$1" = 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%post devel
|
||||
/sbin/ldconfig
|
||||
/sbin/install-info %{_infodir}/autosprintf.info %{_infodir}/dir || :
|
||||
|
||||
|
||||
%preun devel
|
||||
if [ "$1" = 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/autosprintf.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
|
||||
%postun devel -p /sbin/ldconfig
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS
|
||||
%doc COPYING gettext-tools/misc/DISCLAIM README
|
||||
%doc NEWS THANKS
|
||||
%doc gettext-runtime/man/*.1.html
|
||||
%doc gettext-runtime/intl/COPYING*
|
||||
/bin/*
|
||||
%{_bindir}/*
|
||||
%{_libdir}/libgettextlib-%{version}.so
|
||||
%{_libdir}/libgettextsrc-%{version}.so
|
||||
%files -f %{name}-tools.lang
|
||||
%doc AUTHORS NEWS README THANKS
|
||||
%doc gettext-tools/misc/DISCLAIM
|
||||
%doc gettext-tools/man/msg*.1.html
|
||||
%doc gettext-tools/man/recode*.1.html
|
||||
%doc gettext-tools/man/xgettext.1.html
|
||||
%doc gettext-tools/doc/FAQ.html
|
||||
%doc gettext-tools/doc/tutorial.html
|
||||
%{_bindir}/msgattrib
|
||||
%{_bindir}/msgcat
|
||||
%{_bindir}/msgcmp
|
||||
%{_bindir}/msgcomm
|
||||
%{_bindir}/msgconv
|
||||
%{_bindir}/msgen
|
||||
%{_bindir}/msgexec
|
||||
%{_bindir}/msgfilter
|
||||
%{_bindir}/msgfmt
|
||||
%{_bindir}/msggrep
|
||||
%{_bindir}/msginit
|
||||
%{_bindir}/msgmerge
|
||||
%{_bindir}/msgunfmt
|
||||
%{_bindir}/msguniq
|
||||
%{_bindir}/recode-sr-latin
|
||||
%{_bindir}/xgettext
|
||||
%{_infodir}/gettext*
|
||||
%{_mandir}/man1/*
|
||||
%exclude %{_mandir}/man1/autopoint.1*
|
||||
%exclude %{_mandir}/man1/envsubst.1*
|
||||
%exclude %{_mandir}/man1/gettextize.1*
|
||||
%exclude %{_mandir}/man1/msghack.1*
|
||||
%{_mandir}/man1/msg*
|
||||
%{_mandir}/man1/recode*.1*
|
||||
%{_mandir}/man1/xgettext.1*
|
||||
%{_libdir}/%{name}
|
||||
%if %{with java}
|
||||
%exclude %{_libdir}/%{name}/gnu.gettext.*
|
||||
%endif
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/archive.tar.gz
|
||||
%{_datadir}/%{name}/intl
|
||||
%dir %{_datadir}/%{name}/its
|
||||
%{_datadir}/%{name}/ABOUT-NLS
|
||||
%{_datadir}/%{name}/po
|
||||
%{_datadir}/%{name}/styles
|
||||
%if %{with jar}
|
||||
%{_datadir}/%{name}/libintl.jar
|
||||
%endif
|
||||
%dir %{_datadir}/%{name}-%{version}
|
||||
%{_datadir}/%{name}-%{version}/its
|
||||
|
||||
%files runtime -f %{name}-runtime.lang
|
||||
%license COPYING
|
||||
%doc gettext-runtime/BUGS
|
||||
%doc gettext-runtime/man/gettext.1.html
|
||||
%doc gettext-runtime/man/ngettext.1.html
|
||||
%doc gettext-runtime/intl/COPYING*
|
||||
%{_bindir}/gettext
|
||||
%{_bindir}/gettext.sh
|
||||
%{_bindir}/ngettext
|
||||
%exclude %{_mandir}/man1/autopoint.1*
|
||||
%exclude %{_mandir}/man1/envsubst.1*
|
||||
%exclude %{_mandir}/man1/gettextize.1*
|
||||
%exclude %{_mandir}/man1/msg*
|
||||
%exclude %{_mandir}/man1/recode-sr-latin.1*
|
||||
%exclude %{_mandir}/man1/xgettext.1*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files envsubst
|
||||
%license COPYING
|
||||
%doc gettext-runtime/man/envsubst.1.html
|
||||
%{_bindir}/envsubst
|
||||
%{_mandir}/man1/envsubst.1*
|
||||
|
||||
%files common-devel
|
||||
%{_datadir}/%{name}/archive.*.tar.xz
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc gettext-runtime/man/*.3.html ChangeLog
|
||||
%{_datadir}/%{name}/ABOUT-NLS
|
||||
%doc gettext-tools/man/autopoint.1.html
|
||||
%doc gettext-tools/man/gettextize.1.html
|
||||
%{_bindir}/autopoint
|
||||
%{_bindir}/gettextize
|
||||
%{_datadir}/%{name}/projects/
|
||||
%{_datadir}/%{name}/config.rpath
|
||||
%{_datadir}/%{name}/*.h
|
||||
%{_datadir}/%{name}/msgunfmt.tcl
|
||||
%{_datadir}/aclocal/*
|
||||
%{_includedir}/*
|
||||
%{_includedir}/autosprintf.h
|
||||
%{_includedir}/gettext-po.h
|
||||
%{_infodir}/autosprintf*
|
||||
%{_libdir}/libasprintf.so
|
||||
%{_libdir}/libgettextpo.so
|
||||
%{_libdir}/libgettextlib.so
|
||||
%{_libdir}/libgettextsrc.so
|
||||
%{_libdir}/preloadable_libintl.so
|
||||
%{_mandir}/man1/autopoint.1*
|
||||
%{_mandir}/man1/gettextize.1*
|
||||
%{_mandir}/man3/*
|
||||
%{_datadir}/%{name}/javaversion.class
|
||||
%doc gettext-runtime/intl-java/javadoc*
|
||||
|
@ -267,13 +396,393 @@ fi
|
|||
%endif
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libasprintf.so.0*
|
||||
%{_libdir}/libgettextpo.so.0*
|
||||
%{_libdir}/libgettextlib-0.*.so
|
||||
%{_libdir}/libgettextsrc-0.*.so
|
||||
%if %{with jar}
|
||||
%{_datadir}/%{name}/libintl.jar
|
||||
%endif
|
||||
|
||||
%{_libdir}/libasprintf.so.*
|
||||
%{_libdir}/libgettextpo.so.*
|
||||
%files -n emacs-%{name}
|
||||
%dir %{_emacs_sitelispdir}/%{name}
|
||||
%{_emacs_sitelispdir}/%{name}/*.elc
|
||||
%{_emacs_sitelispdir}/%{name}/*.el
|
||||
%{_emacs_sitestartdir}/*.el
|
||||
|
||||
%files -n msghack
|
||||
%license COPYING
|
||||
%{_bindir}/msghack
|
||||
%{_mandir}/man1/msghack.1*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Oct 14 2022 Sundeep Anand <suanand@redhat.com> - 0.21.1-1
|
||||
- update to 0.21.1 release
|
||||
|
||||
* Thu Oct 13 2022 Sundeep Anand <suanand@redhat.com> - 0.21-20.0.20220203
|
||||
- Include doc and man pages for envsubst subpackage.
|
||||
Move _libdir and _datadir from gettext-runtime to gettext package.
|
||||
|
||||
* Mon Sep 12 2022 Sundeep Anand <suanand@redhat.com> - 0.21-19.0.20220203
|
||||
- Add conflicts to enable new (sub)packages installable independently of the original package.
|
||||
|
||||
* Wed Aug 10 2022 Honza Horak <hhorak@redhat.com> - 0.21-18.0.20220203
|
||||
- Introduce envsubst sub-package for allow install envsubst with minimal
|
||||
footprint
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-17.0.20220203
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jun 8 2022 Sundeep Anand <suanand@redhat.com> - 0.21-16.0.20220203
|
||||
- separate out gettext-runtime from the main package into a subpackage
|
||||
|
||||
* Tue Jun 7 2022 Sundeep Anand <suanand@redhat.com> - 0.21-15.0.20220203
|
||||
- add Provides: gettext-runtime to gettext package for forward compatibility.
|
||||
- and removed Provides: gettext-tools
|
||||
|
||||
* Mon Jun 6 2022 Sundeep Anand <suanand@redhat.com> - 0.21-14.0.20220203
|
||||
- add Provides: gettext-tools to gettext package for forward compatibility.
|
||||
|
||||
* Thu Mar 31 2022 Jens Petersen <petersen@redhat.com> - 0.21-13.0.20220203
|
||||
- add Java 17 support patch from Mamoru Tasaka (#2062407)
|
||||
|
||||
* Wed Mar 9 2022 Sundeep Anand <suanand@redhat.com> - 0.21-12.0.20220203
|
||||
- fix gettext snapshot versioning issue to make it canonical (#2061646)
|
||||
|
||||
* Thu Mar 3 2022 Sundeep Anand <suanand@redhat.com> - 0.21-11.0.20220203
|
||||
- Rebuild with gettext-snapshot-20220228 to fix ppc64le and tests (#2045414)
|
||||
Removed gettext-0.21-gnulib-perror-tests.patch as it is upstreamed.
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Nov 23 2021 Jens Petersen <petersen@redhat.com> - 0.21-9
|
||||
- update autotools files with autoreconf to fix FTBFS (#2000426)
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue May 25 2021 Florian Weimer <fweimer@redhat.com> - 0.21-7
|
||||
- Rebuild with new binutils to fix ppc64le corruption (#1960730)
|
||||
|
||||
* Tue May 11 2021 Sundeep Anand <suanand@redhat.com> - 0.21-6
|
||||
- Add gettext-0.21-covscan.patch to fix issues detected by static analyzers
|
||||
|
||||
* Fri Apr 30 2021 Sundeep Anand <suanand@redhat.com> - 0.21-5
|
||||
- Add gettext-0.21-disable-libtextstyle.patch
|
||||
Do not build libtextstyle, as it depends on libcroco
|
||||
which is now unmaintained and has known security bugs.
|
||||
Obsolete libtextstyle and libtextstyle-devel packages.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Sep 7 2020 Sundeep Anand <suanand@redhat.com> - 0.21-3
|
||||
- include patch to fix gnulib perror tests (rhbz#1867021)
|
||||
|
||||
* Thu Aug 6 2020 Jens Petersen <petersen@redhat.com> - 0.21-2
|
||||
- reenable testsuite except for armv7hl which is failing
|
||||
|
||||
* Mon Aug 03 2020 Sundeep Anand <suanand@redhat.com> - 0.21-1
|
||||
- gettext-0.21 is available (rhbz#1860728)
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-4
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 0.20.2-3
|
||||
- Bundle libcroco so we can remove the system package
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Apr 14 2020 Sundeep Anand <suanand@redhat.com> - 0.20.2-1
|
||||
- gettext-0.20.2 is available (rhbz#1823721)
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 06 2020 Sundeep Anand <suanand@redhat.com> - 0.20.1-3
|
||||
- Add diffutils dependency on gettext-devel (rhbz#1774899)
|
||||
|
||||
* Tue Aug 20 2019 Daiki Ueno <dueno@redhat.com> - 0.20.1-2
|
||||
- Fix misbehavior of msgmerge --for-msgfmt
|
||||
|
||||
* Fri Aug 9 2019 Jerry James <loganjerry@gmail.com> - 0.20.1-1
|
||||
- update to 0.20.1 release, all patches upstreamed
|
||||
- add GFDL to License fields due to info files
|
||||
- add libtextstyle{,-devel} subpackages
|
||||
- reenable testsuite
|
||||
- build with libacl support
|
||||
- BR various glibc langpacks wanted by the tests
|
||||
- drop ancient Conflicts due to UsrMove
|
||||
- prevent rpaths rather than removing them
|
||||
- explicitly list binaries in the main package to avoid extra build-ids
|
||||
|
||||
* Fri Aug 9 2019 Jens Petersen <petersen@redhat.com> - 0.19.8.1-22
|
||||
- temporarily disable testsuite (#1735245)
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Mar 7 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 0.19.8.1-20
|
||||
- Remove obsolete requirements for %%post/%%preun scriptlets
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Nov 08 2018 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-18
|
||||
- fix CVE-2018-18751 (rhbz#1647044)
|
||||
- put gettextize man page into gettext-devel (man page scan, rhbz#1611303)
|
||||
|
||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.19.8.1-17
|
||||
- Rebuild with fixed binutils
|
||||
|
||||
* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.19.8.1-16
|
||||
- Replace obsolete scriptlets
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.19.8.1-13
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
||||
* Fri Jan 05 2018 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-12
|
||||
- xgettext --its segfault fix (rhbz#1531476)
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Mar 15 2017 Kalev Lember <klember@redhat.com> - 0.19.8.1-9
|
||||
- Depend on the exact version of the library sub package
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.8.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Jan 26 2017 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-7
|
||||
- really remove Requires: git from gettext-devel (rhbz#1161284)
|
||||
- make the BuildRequires unconditional (rhbz#1416691)
|
||||
|
||||
* Wed Dec 21 2016 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-6
|
||||
- disable test-lock for 'gettext-tool' subdir too (rhbz#1406031)
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.19.8.1-5
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Fri Dec 16 2016 Petr Šabata <contyk@redhat.com> - 0.19.8.1-4
|
||||
- Subpackage msghack so that gettext doesn't depend on python
|
||||
- name the new sub-package 'msghack'
|
||||
|
||||
* Tue Nov 29 2016 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-3
|
||||
- devel subpackage to Require 'xz' (rhbz#1399270)
|
||||
|
||||
* Wed Aug 10 2016 Daiki Ueno <dueno@redhat.com> - 0.19.8.1-2
|
||||
- utilize %%autosetup
|
||||
- apply patch to fix po-send-mail when used with Emacs 25 (#1356642)
|
||||
|
||||
* Sat Jun 11 2016 Daiki Ueno <dueno@redhat.com> - 0.19.8.1-1
|
||||
- update to 0.19.8.1 release
|
||||
|
||||
* Thu Jun 9 2016 Daiki Ueno <dueno@redhat.com> - 0.19.8-1
|
||||
- update to 0.19.8 release
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jan 12 2016 Daiki Ueno <dueno@redhat.com> - 0.19.7-3
|
||||
- own .../gettext/its for third-party *.its files
|
||||
- add a work around for test-isinf failure on ppc64le (#1297387)
|
||||
|
||||
* Fri Jan 8 2016 Daiki Ueno <dueno@redhat.com> - 0.19.7-2
|
||||
- apply patch to recognize .glade extension for GtkBuilder files (#1296653)
|
||||
|
||||
* Thu Dec 10 2015 Daiki Ueno <dueno@redhat.com> - 0.19.7-1
|
||||
- update to 0.19.7 release
|
||||
|
||||
* Thu Sep 24 2015 Daiki Ueno <dueno@redhat.com> - 0.19.6-1
|
||||
- update to 0.19.6 release
|
||||
|
||||
* Wed Jul 22 2015 Daiki Ueno <dueno@redhat.com> - 0.19.5.1-2
|
||||
- work around version conflict between gettextize and autopoint
|
||||
|
||||
* Thu Jul 16 2015 Daiki Ueno <dueno@redhat.com> - 0.19.5.1-1
|
||||
- update to 0.19.5.1 release
|
||||
|
||||
* Fri Jun 26 2015 Daiki Ueno <dueno@redhat.com> - 0.19.4-7
|
||||
- drop -el subpackage (#1234583)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.19.4-5
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.19.4-4
|
||||
- Rebuilt for Fedora 23 Change
|
||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||
|
||||
* Thu Feb 19 2015 Daiki Ueno <dueno@redhat.com> - 0.19.4-3
|
||||
- port msghack.py to Python 3 (#1192086)
|
||||
|
||||
* Wed Dec 31 2014 Daiki Ueno <dueno@redhat.com> - 0.19.4-2
|
||||
- remove git dependency from -devel subpackage (#1161284)
|
||||
|
||||
* Fri Dec 26 2014 Daiki Ueno <dueno@redhat.com> - 0.19.4-1
|
||||
- update to 0.19.4 release
|
||||
|
||||
* Tue Oct 28 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.19.3-2
|
||||
- Disable the test_lock test as it often hangs on a number of arches
|
||||
|
||||
* Thu Oct 16 2014 Daiki Ueno <dueno@redhat.com> - 0.19.3-1
|
||||
- update to 0.19.3 release
|
||||
- remove patches included in 0.19.3
|
||||
- remove autoconf/automake/libtool/bison from BR, as we don't do bootstrap
|
||||
|
||||
* Wed Oct 15 2014 Daiki Ueno <dueno@redhat.com> - 0.19.2-5
|
||||
- apply patch to fix infloop in autopoint (Closes: #1151238)
|
||||
- apply patch to support newer ncurses in F-22
|
||||
|
||||
* Fri Oct 3 2014 Daiki Ueno <dueno@redhat.com> - 0.19.2-4
|
||||
- apply patch to fix C octal character escape handling (Closes: #1147535)
|
||||
|
||||
* Tue Sep 02 2014 Dennis Gilmore <dennis@ausil.us> - 0.19.2-3
|
||||
- rebuild for libunistring soname bump
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Mon Jul 14 2014 Daiki Ueno <dueno@redhat.com> - 0.19.2-1
|
||||
- update to 0.19.2 release
|
||||
|
||||
* Mon Jul 7 2014 Daiki Ueno <dueno@redhat.com> - 0.19.1-2
|
||||
- apply patch to msghack.py, for Python 3 compatibility (Closes: #1113425,
|
||||
thanks to Bohuslav "Slavek" Kabrda)
|
||||
|
||||
* Tue Jun 10 2014 Daiki Ueno <dueno@redhat.com> - 0.19.1-1
|
||||
- update to 0.19.1 release
|
||||
- switch to xz-compressed archive
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Jun 2 2014 Daiki Ueno <dueno@redhat.com> - 0.19-2
|
||||
- apply patch to workaround msgfmt bug that counts warnings as errors
|
||||
|
||||
* Mon Jun 2 2014 Daiki Ueno <dueno@redhat.com> - 0.19-1
|
||||
- update to 0.19 release
|
||||
- remove upstreamed -Wformat-security patch
|
||||
|
||||
* Tue Jan 7 2014 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-1
|
||||
- update to 0.18.3.2 release
|
||||
- apply patch to suppress -Wformat-security warnings in gnulib-tests
|
||||
|
||||
* Sun Aug 25 2013 Daiki Ueno <dueno@redhat.com> - 0.18.3.1-1
|
||||
- update to 0.18.3.1 release
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Jul 10 2013 Daiki Ueno <dueno@redhat.com> - 0.18.3-1
|
||||
- update to 0.18.3 release
|
||||
|
||||
* Wed Jun 26 2013 Daiki Ueno <dueno@redhat.com> - 0.18.2.1-2
|
||||
- add a man page for msghack
|
||||
- fix bogus date in %%changelog
|
||||
|
||||
* Tue Mar 12 2013 Daiki Ueno <dueno@redhat.com> - 0.18.2.1-1
|
||||
- update to 0.18.2.1 release (not really necessary though)
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Dec 26 2012 Daiki Ueno <dueno@redhat.com> - 0.18.2-1
|
||||
- update to 0.18.2 release (based on the spec patch by Jens Petersen)
|
||||
|
||||
* Tue Oct 2 2012 Jens Petersen <petersen@redhat.com> - 0.18.1.1-17
|
||||
- move gettextize to the devel subpackage with its source data files
|
||||
- update msghack to GPL v3
|
||||
|
||||
* Fri Jul 27 2012 Jens Petersen <petersen@redhat.com> - 0.18.1.1-16
|
||||
- patch gnulib since glibc and C11 dropped gets
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18.1.1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue May 29 2012 Remi Collet <remi@fedoraproject.org> - 0.18.1.1-14
|
||||
- add upstream patch from debian to fix xgettext segfault in
|
||||
remember_a_message_plural (#826138)
|
||||
|
||||
* Thu May 17 2012 Jens Petersen <petersen@redhat.com> - 0.18.1.1-13
|
||||
- base package now provides bundled(gnulib) to make it clear that
|
||||
gettext is built with bundled gnulib (#821757)
|
||||
|
||||
* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 0.18.1.1-12
|
||||
- add filesystem guard
|
||||
|
||||
* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 0.18.1.1-11
|
||||
- install everything in /usr
|
||||
https://fedoraproject.org/wiki/Features/UsrMove
|
||||
|
||||
* Tue Jan 10 2012 Nils Philippsen <nils@redhat.com> - 0.18.1.1-10
|
||||
- rebuild for gcc 4.7
|
||||
|
||||
* Tue Oct 4 2011 Jens Petersen <petersen@redhat.com> - 0.18.1.1-9
|
||||
- correct the configure --with-pic option syntax (Gilles Espinasse)
|
||||
|
||||
* Wed Sep 28 2011 Jens Petersen <petersen@redhat.com> - 0.18.1.1-8
|
||||
- add gettext-readlink-einval.patch to fix build on kernel >= 2.6.39 (#739188)
|
||||
- add optional buildrequires suggested in the DEPENDENCIES file
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18.1.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Mon Feb 7 2011 Jens Petersen <petersen@redhat.com> - 0.18.1.1-6
|
||||
- remove internal libgettextlib.so and libgettextsrc.so (#650471)
|
||||
|
||||
* Mon Feb 7 2011 Jens Petersen <petersen@redhat.com> - 0.18.1.1-5
|
||||
- fix license field of gettext-libs since libgettextpo is GPLv3+ (#640158)
|
||||
|
||||
* Thu Sep 9 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-4
|
||||
- subpackage archive.git.tar.gz to avoid multilib conflicts (#631733)
|
||||
- update msghack.py header
|
||||
|
||||
* Mon Aug 23 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-3
|
||||
- merge autopoint subpackage into devel to simplify deps (#625325)
|
||||
- have ABOUT-NLS only in the base package datadir
|
||||
|
||||
* Wed Jun 23 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-2
|
||||
- correct license tag from GPLv3 to GPLv3+
|
||||
- subpackage autopoint which requires git (#574031)
|
||||
- no longer require cvs (#606746)
|
||||
- add bcond for git
|
||||
|
||||
* Fri May 21 2010 Jens Petersen <petersen@redhat.com> - 0.18.1.1-1
|
||||
- update to 0.18.1.1 release (#591044)
|
||||
- gettext-0.17-autopoint-CVS-441481.patch, gettext-0.17-long-long-int-m4.patch
|
||||
gettext-0.17-open-args.patch, and
|
||||
gettext-xgettext-python-unicode-surrogate-473946.patch are upstream
|
||||
- move libintl.jar to lib subpackage to avoid multilib problems
|
||||
(reported by Jim Radford in #595922)
|
||||
- disable java for now
|
||||
- use chrpath to get us out of rpath hell instead of complicated libtool hacks
|
||||
- enable git support
|
||||
|
||||
* Fri Apr 23 2010 Jens Petersen <petersen@redhat.com> - 0.17-17
|
||||
- create emacs subpackages for po-mode.el (thanks for patch from
|
||||
Jonathan Underwood, #579452)
|
||||
- provide emacs-po-mode
|
||||
- move libgettextlib and libgettextsrc from base to libs subpackage
|
||||
(requested by Peter Robinson for blender, #579388)
|
||||
|
||||
* Fri Nov 27 2009 Jens Petersen <petersen@redhat.com> - 0.17-16
|
||||
- fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
|
||||
- cleanup gettext-0.17-rpathFix.patch
|
||||
|
@ -314,13 +823,13 @@ fi
|
|||
- Fix the build failure with koji.
|
||||
|
||||
* Fri Aug 29 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-7
|
||||
- Remove the gettext-libs docs, as they are talking about autoconf, libtool,
|
||||
- Remove the gettext-libs docs, as they are talking about autoconf, libtool,
|
||||
which are not directly related to the gettext-libs.
|
||||
- Remove unused definition and trailing space.
|
||||
- Fix the build failure with mock .
|
||||
|
||||
* Tue Aug 19 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-6
|
||||
- Fixed Bug 456666 msghack doesn't check for mandatory cmd line params
|
||||
- Fixed Bug 456666 msghack doesn't check for mandatory cmd line params
|
||||
by adding checking statements and display usage (msghack.py modified)
|
||||
- rpath patch for binary-or-shlib-defines-rpath in x86_64.
|
||||
|
||||
|
@ -438,7 +947,7 @@ fi
|
|||
- rebuild
|
||||
|
||||
* Wed Feb 22 2006 Karsten Hopp <karsten@redhat.de> 0.14.5-3
|
||||
- --disable-csharp, otherwise it'll build a dll when mono is
|
||||
- --disable-csharp, otherwise it'll build a dll when mono is
|
||||
installed in the buildroot.
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.14.5-2.2.2
|
||||
|
@ -603,7 +1112,7 @@ fi
|
|||
without
|
||||
|
||||
* Thu Aug 9 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- Added "--append" and "-o" to msghack, which should address
|
||||
- Added "--append" and "-o" to msghack, which should address
|
||||
initial concerns in #50065
|
||||
|
||||
* Thu Jul 19 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
|
@ -693,7 +1202,7 @@ fi
|
|||
* Thu May 06 1999 Cristian Gafton <gafton@redhat.com>
|
||||
- msghack updates
|
||||
|
||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
||||
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
||||
- auto rebuild in the new build environment (release 8)
|
||||
|
||||
* Mon Mar 08 1999 Cristian Gafton <gafton@redhat.com>
|
||||
|
@ -708,7 +1217,7 @@ fi
|
|||
* Sun Sep 13 1998 Cristian Gafton <gafton@redhat.com>
|
||||
- include the aclocal support files
|
||||
|
||||
* Fri Sep 3 1998 Bill Nottingham <notting@redhat.com>
|
||||
* Thu Sep 3 1998 Bill Nottingham <notting@redhat.com>
|
||||
- remove devel package (functionality is in glibc)
|
||||
|
||||
* Tue Sep 1 1998 Jeff Johnson <jbj@redhat.com>
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
gettext-0_17-6_fc9:HEAD:gettext-0.17-6.fc9.src.rpm:1219621503
|
||||
gettext-0_17-7_fc9:HEAD:gettext-0.17-7.fc9.src.rpm:1219969143
|
||||
gettext-0_17-8_fc9:HEAD:gettext-0.17-8.fc9.src.rpm:1219972072
|
|
@ -0,0 +1,45 @@
|
|||
.TH MSGHACK "1" "June 2013" "msghack" "User Commands"
|
||||
.SH NAME
|
||||
msghack \- alter PO files in ways
|
||||
.SH SYNOPSIS
|
||||
.B msghack
|
||||
[\fIOPTION\fR] \fIfile.po \fR[\fIref.po\fR]
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
This program can be used to alter .po files in ways no sane mind would think about.
|
||||
.TP
|
||||
\fB\-o\fR
|
||||
result will be written to FILE
|
||||
.TP
|
||||
\fB\-\-invert\fR
|
||||
invert a po file by switching msgid and msgstr
|
||||
.TP
|
||||
\fB\-\-master\fR
|
||||
join any number of files in a master\-formatted catalog
|
||||
.TP
|
||||
\fB\-\-empty\fR
|
||||
empty the contents of the .po file, creating a .pot
|
||||
.TP
|
||||
\fB\-\-append\fR
|
||||
append entries from ref.po that don't exist in file.po
|
||||
.PP
|
||||
Note: It is just a replacement of msghack for backward support.
|
||||
.PP
|
||||
This program can be used to alter .po files in ways no sane mind would think about.
|
||||
.TP
|
||||
\fB\-o\fR
|
||||
result will be written to FILE
|
||||
.TP
|
||||
\fB\-\-invert\fR
|
||||
invert a po file by switching msgid and msgstr
|
||||
.TP
|
||||
\fB\-\-master\fR
|
||||
join any number of files in a master\-formatted catalog
|
||||
.TP
|
||||
\fB\-\-empty\fR
|
||||
empty the contents of the .po file, creating a .pot
|
||||
.TP
|
||||
\fB\-\-append\fR
|
||||
append entries from ref.po that don't exist in file.po
|
||||
.PP
|
||||
Note: It is just a replacement of msghack for backward support.
|
92
msghack.py
92
msghack.py
|
@ -1,13 +1,11 @@
|
|||
#!/usr/bin/python
|
||||
#!/usr/bin/python3
|
||||
## -*- coding: utf-8 -*-
|
||||
## Copyright (C) 2001 Red Hat, Inc.
|
||||
## Copyright (C) 2001, 2004, 2008, 2012 Red Hat, Inc.
|
||||
## Copyright (C) 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
|
||||
## v0.2 - 2001-08-21
|
||||
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
## This program is free software: you can redistribute it and/or modify
|
||||
## it under the terms of the GNU General Public License as published by
|
||||
## the Free Software Foundation; either version 2 of the License, or
|
||||
## the Free Software Foundation, either version 3 of the License, or
|
||||
## (at your option) any later version.
|
||||
|
||||
## This program is distributed in the hope that it will be useful,
|
||||
|
@ -16,14 +14,12 @@
|
|||
## GNU General Public License for more details.
|
||||
|
||||
## You should have received a copy of the GNU General Public License
|
||||
## along with this program; if not, write to the Free Software
|
||||
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
"""
|
||||
A msghack replacement
|
||||
"""
|
||||
|
||||
import string
|
||||
import sys
|
||||
|
||||
class GTMessage:
|
||||
|
@ -38,8 +34,8 @@ class GTMessage:
|
|||
@message The message
|
||||
@id The messageid associated with the object
|
||||
"""
|
||||
self._message=string.strip(message)
|
||||
self._id=string.strip(id)
|
||||
self._message=message.strip()
|
||||
self._id=id.strip()
|
||||
self._refs=[]
|
||||
for ref in refs:
|
||||
self._refs.append(ref)
|
||||
|
@ -181,7 +177,7 @@ class GTFile:
|
|||
msgar.append(GTMessage(message._id,message._message,message._refs))
|
||||
continue
|
||||
msg=GTMessage(message._message,message._id,message._refs)
|
||||
if not msght.has_key(msg._id):
|
||||
if msg._id not in msght:
|
||||
msght[msg._id]=msg
|
||||
msgar.append(msg)
|
||||
else:
|
||||
|
@ -202,7 +198,7 @@ class GTFile:
|
|||
res=""
|
||||
for message in self._messages:
|
||||
msgid=message._id
|
||||
if msgids.has_key(msgid):
|
||||
if msgid in msgids:
|
||||
res=res+"Duplicate: %s\n" % (msgid)
|
||||
else:
|
||||
msgids[msgid]=1
|
||||
|
@ -262,12 +258,12 @@ class GTFile:
|
|||
inmsgstr=0
|
||||
templines=file.readlines()
|
||||
for line in templines:
|
||||
lines.append(string.strip(line))
|
||||
lines.append(line.strip())
|
||||
for line in lines:
|
||||
pos=string.find(line,'"')
|
||||
pos2=string.rfind(line,'"')
|
||||
pos=line.find('"')
|
||||
pos2=line.rfind('"')
|
||||
if line and line[0]=="#":
|
||||
refs.append(string.strip(line))
|
||||
refs.append(line.strip())
|
||||
if inmsgstr==0 and line[:6]=="msgstr":
|
||||
msgstr=""
|
||||
inmsgstr=1
|
||||
|
@ -345,7 +341,7 @@ class GTMaster:
|
|||
|
||||
def printUsage():
|
||||
"Print the usage messages"
|
||||
print "Usage: ", str(sys.argv[0])," [OPTION] file.po [ref.po]\n\
|
||||
print("Usage: " + str(sys.argv[0]) + " [OPTION] file.po [ref.po]\n\
|
||||
This program can be used to alter .po files in ways no sane mind would think about.\n\
|
||||
-o result will be written to FILE\n\
|
||||
--invert invert a po file by switching msgid and msgstr\n\
|
||||
|
@ -353,26 +349,26 @@ This program can be used to alter .po files in ways no sane mind would think abo
|
|||
--empty empty the contents of the .po file, creating a .pot\n\
|
||||
--append append entries from ref.po that don't exist in file.po\n\
|
||||
\n\
|
||||
Note: It is just a replacement of msghack for backward support.\n"
|
||||
Note: It is just a replacement of msghack for backward support.\n")
|
||||
|
||||
|
||||
if __name__=="__main__":
|
||||
output=None
|
||||
res=None
|
||||
if("-o") in sys.argv:
|
||||
if (len(sys.argv)<=sys.argv.index("-o")+1):
|
||||
print "file.po and ref.po are not specified!\n"
|
||||
printUsage()
|
||||
exit(1)
|
||||
output=sys.argv[sys.argv.index("-o")+1]
|
||||
if (len(sys.argv)<=sys.argv.index("-o")+1):
|
||||
print("file.po and ref.po are not specified!\n")
|
||||
printUsage()
|
||||
exit(1)
|
||||
output=sys.argv[sys.argv.index("-o")+1]
|
||||
sys.argv.remove("-o")
|
||||
sys.argv.remove(output)
|
||||
sys.argv.remove(output)
|
||||
if("--invert") in sys.argv:
|
||||
if (len(sys.argv)<=sys.argv.index("--invert")+1):
|
||||
print "file.po is not specified!\n"
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--invert")+1]
|
||||
if (len(sys.argv)<=sys.argv.index("--invert")+1):
|
||||
print("file.po is not specified!\n")
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--invert")+1]
|
||||
gtf=GTFile(file)
|
||||
res1=gtf.msgidDupes()
|
||||
if res1:
|
||||
|
@ -380,41 +376,41 @@ if __name__=="__main__":
|
|||
sys.exit(1)
|
||||
res=str(gtf.invertedStrings())
|
||||
elif("--empty") in sys.argv:
|
||||
if (len(sys.argv)<=sys.argv.index("--empty")+1):
|
||||
print "file.po is not specified!\n"
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--empty")+1]
|
||||
if (len(sys.argv)<=sys.argv.index("--empty")+1):
|
||||
print("file.po is not specified!\n")
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--empty")+1]
|
||||
gtf=GTFile(file)
|
||||
res=str(gtf.emptyMsgStrings())
|
||||
elif("--master") in sys.argv:
|
||||
if (len(sys.argv)<=sys.argv.index("--master")+1):
|
||||
print "file.po is not specified!\n"
|
||||
printUsage()
|
||||
exit(1)
|
||||
loc=sys.argv.index("--master")+1
|
||||
if (len(sys.argv)<=sys.argv.index("--master")+1):
|
||||
print("file.po is not specified!\n")
|
||||
printUsage()
|
||||
exit(1)
|
||||
loc=sys.argv.index("--master")+1
|
||||
gtfs=[]
|
||||
for file in sys.argv[loc:]:
|
||||
gtfs.append(GTFile(file))
|
||||
master=GTMaster(gtfs)
|
||||
res=str(master)
|
||||
elif("--append") in sys.argv:
|
||||
if (len(sys.argv)<=sys.argv.index("--append")+2):
|
||||
print "file.po and/or ref.po are not specified!\n"
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--append")+1]
|
||||
if (len(sys.argv)<=sys.argv.index("--append")+2):
|
||||
print("file.po and/or ref.po are not specified!\n")
|
||||
printUsage()
|
||||
exit(1)
|
||||
file=sys.argv[sys.argv.index("--append")+1]
|
||||
file2=sys.argv[sys.argv.index("--append")+2]
|
||||
gtf=GTFile(file)
|
||||
gtf2=GTFile(file2)
|
||||
gtf.append(gtf2)
|
||||
res=str(gtf)
|
||||
else:
|
||||
#print "Not implemented: "+str(sys.argv)
|
||||
printUsage()
|
||||
#print("Not implemented: "+str(sys.argv))
|
||||
printUsage()
|
||||
sys.exit(1)
|
||||
if not output:
|
||||
print res
|
||||
print(res)
|
||||
else:
|
||||
file=open(output,"w")
|
||||
file.write(res)
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
58a2bc6d39c0ba57823034d55d65d606 gettext-0.17.tar.gz
|
||||
SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
---
|
||||
# Tests run on Atomic, Classic and Container
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-beakerlib
|
||||
tags:
|
||||
- atomic
|
||||
- classic
|
||||
- container
|
||||
repositories:
|
||||
- repo: "https://src.fedoraproject.org/tests/gettext.git"
|
||||
dest: "gettext"
|
||||
tests:
|
||||
- gettext/gettext-tests
|
||||
required_packages:
|
||||
- gettext
|
Loading…
Reference in New Issue