Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1 @@
-/gettext-0.*.tar.xz
+/gettext-0.*.tar.*

STAGE2-gettext

@@ -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

disable-gettext-runtime-test-lock.patch

@@ -1,26 +0,0 @@
-Index: gettext-0.19.2/gettext-runtime/tests/Makefile.am
-===================================================================
---- gettext-0.19.2.orig/gettext-runtime/tests/Makefile.am
-+++ gettext-0.19.2/gettext-runtime/tests/Makefile.am
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
- EXTRA_DIST =
- 
--TESTS = test-lock
-+TESTS =
- 
- AM_CPPFLAGS = \
-   -I.. \
-Index: gettext-0.19.2/gettext-runtime/tests/Makefile.in
-===================================================================
---- gettext-0.19.2.orig/gettext-runtime/tests/Makefile.in
-+++ gettext-0.19.2/gettext-runtime/tests/Makefile.in
-@@ -77,7 +77,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--TESTS = test-lock$(EXEEXT)
-+TESTS = 
- noinst_PROGRAMS = test-lock$(EXEEXT)
- subdir = tests
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

gettext-0.21.1-covscan.patch

@@ -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;
+

gettext-0.21.1-disable-libtextstyle.patch

@@ -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.
+

gettext-java17-2062407.patch

@@ -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,

gettext.spec

@@ -1,26 +1,40 @@
 %bcond_with jar
 %bcond_with java
-%bcond_without check
-%bcond_without git
 
-Summary: GNU libraries and utilities for producing multi-lingual messages
+Summary: GNU tools and libraries for localized translated messages
 Name: gettext
-Version: 0.19.4
+Version: 0.21.1
 Release: 2%{?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.xz
-# Disable the test_lock test as it often hangs on a number of arches
-# https://bugzilla.redhat.com/show_bug.cgi?id=1155291
-# http://savannah.gnu.org/bugs/?43487
-Patch0: disable-gettext-runtime-test-lock.patch
+
+# 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
 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
+BuildRequires: automake
+BuildRequires: libtool
+# BuildRequires: bison
+
 BuildRequires: gcc-c++
 %if %{with java}
 # libintl.jar requires gcj >= 4.3 to build
@@ -35,25 +49,34 @@ BuildRequires: zip, unzip
 %endif
 # for po-mode.el
 BuildRequires: emacs
-%if %{with git}
-# for autopoint:
+# for autosetup
 BuildRequires: git
-%endif
-BuildRequires: chrpath
+# 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: expat-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
-BuildRequires: libcroco-devel
+BuildRequires: libacl-devel
 BuildRequires: libunistring-devel
-Requires(post): info
-Requires(preun): info
-# for F17 UsrMove
-Conflicts: filesystem < 3
-Provides: /bin/gettext
-# exception for bundled gnulib copylib
+# 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
@@ -68,9 +91,23 @@ 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}
-Group: Development/Tools
 # autopoint archive
 License: GPLv3+
 BuildArch: noarch
@@ -81,22 +118,18 @@ This package contains common architecture independent gettext development files.
 
 %package devel
 Summary: Development files for %{name}
-Group: Development/Tools
 # autopoint is GPLv3+
 # libasprintf is LGPLv2+
 # libgettextpo is GPLv3+
-License: LGPLv2+ and GPLv3+
+License: LGPLv2+ and GPLv3+ and GFDL
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-common-devel = %{version}-%{release}
-Requires(post): info
-Requires(preun): info
-%if %{with git}
-# for autopoint
-Requires: git
-%endif
+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
@@ -107,10 +140,10 @@ want to add gettext support for your project.
 
 %package libs
 Summary: Libraries for %{name}
-Group: System Environment/Libraries
 # libasprintf is LGPLv2+
 # libgettextpo is GPLv3+
 License: LGPLv2+ and GPLv3+
+Obsoletes: libtextstyle < %{version}-%{release}
 
 %description libs
 This package contains libraries used internationalization support.
@@ -118,30 +151,46 @@ This package contains libraries used internationalization support.
 
 %package -n emacs-%{name}
 Summary: Support for editing po files within GNU Emacs
-Group: Applications/Editors
 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 emacs-%{name}-el
-Summary: Elisp source files for editing po files within GNU Emacs
-Group: Applications/Editors
+%package -n msghack
+Summary: Alter PO files in ways
 BuildArch: noarch
-Requires: emacs-%{name} = %{version}-%{release}
 
-%description -n emacs-%{name}-el
-This package contains the Elisp source files for editing po files within GNU
-Emacs.
+%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
-%patch0 -p1 -b .test_lock
+%autosetup -S git
+# Refresh autotools files to latest versions
+# Should be removed after 0.21:
+autoreconf --force --install
+
+# 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
 %if %{with java}
@@ -150,31 +199,41 @@ export JAVAC=gcj
 export JAR=fastjar
 %endif
 %endif
-# --disable-rpath doesn't work properly on lib64
-%configure --without-included-gettext --enable-nls --disable-static \
-    --enable-shared --with-pic --disable-csharp --disable-rpath \
+%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
-%if %{without git}
-    --disable-git \
-%endif
-%{nil}
+    --with-xz
 
-make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
+# 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
-make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
+%make_install \
     lispdir=%{_datadir}/emacs/site-lisp/gettext \
     aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
 
 
-install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
-install -pm 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_mandir}/man1/msghack.1
-
+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
@@ -191,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
 
@@ -210,6 +269,9 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar
 
+# 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
 
@@ -224,79 +286,93 @@ rm ${RPM_BUILD_ROOT}%{_emacs_sitelispdir}/%{name}/start-po.elc
 
 %find_lang %{name}-runtime
 %find_lang %{name}-tools
-cat %{name}-*.lang > %{name}.lang
-
-# cleanup rpaths
-for i in $RPM_BUILD_ROOT%{_bindir}/* `find $RPM_BUILD_ROOT%{_libdir} -type f`; do
-  if file $i | grep "ELF 64-bit" >/dev/null; then
-     chrpath -l $i && chrpath --delete $i
-  fi
-done
 
 
-%if %{with check}
 %check
 # 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
-%doc 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*
-%{_bindir}/*
-%exclude %{_bindir}/autopoint
-%exclude %{_bindir}/gettextize
+%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*
 %exclude %{_mandir}/man1/autopoint.1*
-%{_mandir}/man1/*
+%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}
+%dir %{_datadir}/%{name}/its
 %{_datadir}/%{name}/ABOUT-NLS
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
+%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
 %doc gettext-runtime/man/*.3.html ChangeLog
+%doc gettext-tools/man/autopoint.1.html
+%doc gettext-tools/man/gettextize.1.html
 %{_bindir}/autopoint
 %{_bindir}/gettextize
 %{_datadir}/%{name}/projects/
@@ -304,14 +380,15 @@ fi
 %{_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}/preloadable_libintl.so
 %{_mandir}/man1/autopoint.1*
+%{_mandir}/man1/gettextize.1*
 %{_mandir}/man3/*
-%{_datadir}/%{name}/intl
 %{_datadir}/%{name}/javaversion.class
 %doc gettext-runtime/intl-java/javadoc*
 %if %{with java}
@@ -319,8 +396,8 @@ fi
 %endif
 
 %files libs
-%{_libdir}/libasprintf.so.*
-%{_libdir}/libgettextpo.so.*
+%{_libdir}/libasprintf.so.0*
+%{_libdir}/libgettextpo.so.0*
 %{_libdir}/libgettextlib-0.*.so
 %{_libdir}/libgettextsrc-0.*.so
 %if %{with jar}
@@ -330,12 +407,232 @@ fi
 %files -n emacs-%{name}
 %dir %{_emacs_sitelispdir}/%{name}
 %{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitelispdir}/%{name}/*.el
 %{_emacs_sitestartdir}/*.el
 
-%files -n emacs-%{name}-el
-%{_emacs_sitelispdir}/%{name}/*.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)
 
@@ -526,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.
 
@@ -650,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
@@ -815,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>
@@ -905,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>

msghack.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 ## -*- coding: utf-8 -*-
 ## Copyright (C) 2001, 2004, 2008, 2012 Red Hat, Inc.
 ## Copyright (C) 2001 Trond Eivind Glomsrød <teg@redhat.com>
@@ -341,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\

sources

@@ -1 +1 @@
-997c9070354eff5517115feaea6038f0  gettext-0.19.4.tar.xz
+SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05

tests/tests.yml

@@ -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