diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index 664f03a..3efcfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/gettext-0.*.tar.xz
+/gettext-0.*.tar.*
diff --git a/disable-gettext-runtime-test-lock.patch b/disable-gettext-runtime-test-lock.patch
deleted file mode 100644
index ec3a59b..0000000
--- a/disable-gettext-runtime-test-lock.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb
-Author:     rpm-build <rpm-build>
-AuthorDate: Wed Dec 21 12:50:54 2016 +0100
-Commit:     rpm-build <rpm-build>
-CommitDate: Wed Dec 21 12:52:36 2016 +0100
-
-    disable-gettext-runtime-test-lock.patch
-
-diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
-index 88a0684..3a27b79 100644
---- a/gettext-runtime/tests/Makefile.am
-+++ b/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.. \
-diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
-index 4327733..5879146 100644
---- a/gettext-runtime/tests/Makefile.in
-+++ b/gettext-runtime/tests/Makefile.in
-@@ -86,7 +86,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--TESTS = test-lock$(EXEEXT)
-+TESTS =
- check_PROGRAMS = test-lock$(EXEEXT)
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
-index 26becd9..4b9d0e4 100644
---- a/gettext-tools/gnulib-tests/Makefile.in
-+++ b/gettext-tools/gnulib-tests/Makefile.in
-@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
- 	test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \
- 	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
- 	test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
--	test-localename$(EXEEXT) test-lock$(EXEEXT) \
-+	test-localename$(EXEEXT) \
- 	test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
- 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
- 	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
diff --git a/gettext-0.21.1-covscan.patch b/gettext-0.21.1-covscan.patch
new file mode 100644
index 0000000..af87a6d
--- /dev/null
+++ b/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;
+
diff --git a/gettext-0.26-c23.diff b/gettext-0.26-c23.diff
new file mode 100644
index 0000000..a4f7584
--- /dev/null
+++ b/gettext-0.26-c23.diff
@@ -0,0 +1,486 @@
+diff -r -u gettext-0.26/gettext-runtime/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-runtime/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-runtime/gnulib-lib/c++defs.h	2025-07-08 10:54:38.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-runtime/gnulib-lib/stdlib.in.h gettext-0.26-patched/gettext-runtime/gnulib-lib/stdlib.in.h
+--- gettext-0.26/gettext-runtime/gnulib-lib/stdlib.in.h	2025-07-08 10:54:38.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/gnulib-lib/stdlib.in.h	2025-12-18 13:05:15.891299356 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-runtime/gnulib-lib/wchar.in.h gettext-0.26-patched/gettext-runtime/gnulib-lib/wchar.in.h
+--- gettext-0.26/gettext-runtime/gnulib-lib/wchar.in.h	2025-07-08 10:54:38.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/gnulib-lib/wchar.in.h	2025-12-18 13:04:13.399876581 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-runtime/intl/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-runtime/intl/gnulib-lib/c++defs.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-runtime/intl/gnulib-lib/stdlib.in.h gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/stdlib.in.h
+--- gettext-0.26/gettext-runtime/intl/gnulib-lib/stdlib.in.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/stdlib.in.h	2025-12-18 13:05:15.892299363 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-runtime/intl/gnulib-lib/wchar.in.h gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/wchar.in.h
+--- gettext-0.26/gettext-runtime/intl/gnulib-lib/wchar.in.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/intl/gnulib-lib/wchar.in.h	2025-12-18 13:04:13.401876594 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/c++defs.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/stdlib.in.h gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/stdlib.in.h
+--- gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/stdlib.in.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/stdlib.in.h	2025-12-18 13:05:15.889299343 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/wchar.in.h gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/wchar.in.h
+--- gettext-0.26/gettext-runtime/libasprintf/gnulib-lib/wchar.in.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-runtime/libasprintf/gnulib-lib/wchar.in.h	2025-12-18 13:04:13.397876567 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-tools/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-tools/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-tools/gnulib-lib/c++defs.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-tools/gnulib-lib/stdlib.in.h gettext-0.26-patched/gettext-tools/gnulib-lib/stdlib.in.h
+--- gettext-0.26/gettext-tools/gnulib-lib/stdlib.in.h	2025-07-08 10:54:39.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/gnulib-lib/stdlib.in.h	2025-12-18 13:05:15.896299390 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-tools/gnulib-lib/wchar.in.h gettext-0.26-patched/gettext-tools/gnulib-lib/wchar.in.h
+--- gettext-0.26/gettext-tools/gnulib-lib/wchar.in.h	2025-07-08 10:54:40.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/gnulib-lib/wchar.in.h	2025-12-18 13:04:13.404876615 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-tools/gnulib-tests/c++defs.h gettext-0.26-patched/gettext-tools/gnulib-tests/c++defs.h
+--- gettext-0.26/gettext-tools/gnulib-tests/c++defs.h	2025-07-08 10:54:40.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/gnulib-tests/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-tools/libgettextpo/c++defs.h gettext-0.26-patched/gettext-tools/libgettextpo/c++defs.h
+--- gettext-0.26/gettext-tools/libgettextpo/c++defs.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgettextpo/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-tools/libgettextpo/stdlib.in.h gettext-0.26-patched/gettext-tools/libgettextpo/stdlib.in.h
+--- gettext-0.26/gettext-tools/libgettextpo/stdlib.in.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgettextpo/stdlib.in.h	2025-12-18 13:05:15.899299410 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-tools/libgettextpo/wchar.in.h gettext-0.26-patched/gettext-tools/libgettextpo/wchar.in.h
+--- gettext-0.26/gettext-tools/libgettextpo/wchar.in.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgettextpo/wchar.in.h	2025-12-18 13:04:13.407876635 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-tools/libgrep/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-tools/libgrep/gnulib-lib/c++defs.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/gettext-tools/libgrep/gnulib-lib/stdlib.in.h gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/stdlib.in.h
+--- gettext-0.26/gettext-tools/libgrep/gnulib-lib/stdlib.in.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/stdlib.in.h	2025-12-18 13:05:15.897299397 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/gettext-tools/libgrep/gnulib-lib/wchar.in.h gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/wchar.in.h
+--- gettext-0.26/gettext-tools/libgrep/gnulib-lib/wchar.in.h	2025-07-08 10:54:49.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/libgrep/gnulib-lib/wchar.in.h	2025-12-18 13:04:13.406876628 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/gettext-tools/tests/gnulib-lib/c++defs.h gettext-0.26-patched/gettext-tools/tests/gnulib-lib/c++defs.h
+--- gettext-0.26/gettext-tools/tests/gnulib-lib/c++defs.h	2025-07-08 10:55:10.000000000 +0200
++++ gettext-0.26-patched/gettext-tools/tests/gnulib-lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/libtextstyle/lib/c++defs.h gettext-0.26-patched/libtextstyle/lib/c++defs.h
+--- gettext-0.26/libtextstyle/lib/c++defs.h	2025-07-08 10:55:22.000000000 +0200
++++ gettext-0.26-patched/libtextstyle/lib/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
+diff -r -u gettext-0.26/libtextstyle/lib/stdlib.in.h gettext-0.26-patched/libtextstyle/lib/stdlib.in.h
+--- gettext-0.26/libtextstyle/lib/stdlib.in.h	2025-07-08 10:55:22.000000000 +0200
++++ gettext-0.26-patched/libtextstyle/lib/stdlib.in.h	2025-12-18 13:05:15.894299376 +0100
+@@ -237,9 +237,9 @@
+ 
+ /* Declarations for ISO C N3322.  */
+ #if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+-_GL_EXTERN_C void *bsearch (const void *__key,
+-                            const void *__base, size_t __nmemb, size_t __size,
+-                            int (*__compare) (const void *, const void *))
++_GL_EXTERN_C void *_GL_FUNCDECL_SYS_NAME (bsearch)
++  (const void *__key, const void *__base, size_t __nmemb, size_t __size,
++   int (*__compare) (const void *, const void *))
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+ _GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                          int (*__compare) (const void *, const void *))
+diff -r -u gettext-0.26/libtextstyle/lib/wchar.in.h gettext-0.26-patched/libtextstyle/lib/wchar.in.h
+--- gettext-0.26/libtextstyle/lib/wchar.in.h	2025-07-08 10:55:22.000000000 +0200
++++ gettext-0.26-patched/libtextstyle/lib/wchar.in.h	2025-12-18 13:04:13.402876601 +0100
+@@ -316,7 +316,7 @@
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+ # ifndef __cplusplus
+-_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
++_GL_EXTERN_C wchar_t *(wmemchr) (const wchar_t *__s, wchar_t __wc, size_t __n)
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+ # endif
+ _GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+diff -r -u gettext-0.26/libtextstyle/tests/c++defs.h gettext-0.26-patched/libtextstyle/tests/c++defs.h
+--- gettext-0.26/libtextstyle/tests/c++defs.h	2025-07-08 10:55:22.000000000 +0200
++++ gettext-0.26-patched/libtextstyle/tests/c++defs.h	2025-12-18 13:08:56.338779679 +0100
+@@ -127,6 +127,16 @@
+ #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+ 
++/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
++   parenthsized func otherwise.  Parenthesization is needed in C23 if
++   the function is like strchr and so is a qualifier-generic macro
++   that expands to something more complicated.  */
++#ifdef __cplusplus
++# define _GL_FUNCDECL_SYS_NAME(func) func
++#else
++# define _GL_FUNCDECL_SYS_NAME(func) (func)
++#endif
++
+ /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+    declares the system function, named func, with the given prototype,
+    consisting of return type, parameters, and attributes.
+@@ -139,7 +149,7 @@
+      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+  */
+ #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
++  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+ 
+ /* _GL_CXXALIAS_RPL (func, rettype, parameters);
+    declares a C++ alias called GNULIB_NAMESPACE::func
diff --git a/gettext-0.26-stdcountof-h.patch b/gettext-0.26-stdcountof-h.patch
new file mode 100644
index 0000000..9070710
--- /dev/null
+++ b/gettext-0.26-stdcountof-h.patch
@@ -0,0 +1,25 @@
+diff -ur gettext-0.26.orig/gettext-tools/gnulib-tests/test-stdcountof-h.c gettext-0.26/gettext-tools/gnulib-tests/test-stdcountof-h.c
+--- gettext-0.26.orig/gettext-tools/gnulib-tests/test-stdcountof-h.c	2025-07-08 14:24:40.000000000 +0530
++++ gettext-0.26/gettext-tools/gnulib-tests/test-stdcountof-h.c	2026-01-13 13:07:35.226196031 +0530
+@@ -42,17 +42,21 @@
+ 
+   (void) local_bounded;
+ 
++#ifdef _gl_verify_is_array
+   (void) _gl_verify_is_array (unbounded);
+   (void) _gl_verify_is_array (bounded);
+   (void) _gl_verify_is_array (multidimensional);
++#endif
+ 
+   ASSERT (countof (bounded) == 10);
+   ASSERT (countof (multidimensional) == 10);
+   ASSERT (countof (local_bounded) == 20);
+ 
+ #if 0 /* These produce compilation errors.  */
++#ifdef _gl_verify_is_array
+   (void) _gl_verify_is_array (integer);
+   (void) _gl_verify_is_array (parameter);
++#endif
+ 
+   ASSERT (countof (integer) >= 0);
+   ASSERT (countof (unbounded) >= 0);
diff --git a/gettext-po-send-mail.patch b/gettext-po-send-mail.patch
deleted file mode 100644
index 2602e1d..0000000
--- a/gettext-po-send-mail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: gettext-0.19.8.1/gettext-tools/misc/po-mode.el
-===================================================================
---- gettext-0.19.8.1.orig/gettext-tools/misc/po-mode.el
-+++ gettext-0.19.8.1/gettext-tools/misc/po-mode.el
-@@ -3518,10 +3518,12 @@ Write to your team?  ('n' if writing to
-             (re-search-forward
-              (concat "^" (regexp-quote mail-header-separator) "\n"))
-             (save-excursion
--              (insert-buffer-substring buffer)
--              (shell-command-on-region
--               (region-beginning) (region-end)
--               (concat po-gzip-uuencode-command " " name ".gz") t t))))))
-+              (save-restriction
-+                (narrow-to-region (point) (point))
-+                (insert-buffer-substring buffer)
-+                (shell-command-on-region
-+                 (point-min) (point-max)
-+                 (concat po-gzip-uuencode-command " " name ".gz") t t)))))))
-   (message ""))
- 
- (defun po-confirm-and-quit ()
diff --git a/gettext.spec b/gettext.spec
index 18f2284..b71e10c 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,31 +1,43 @@
 %bcond_with jar
 %bcond_with java
-%bcond_without check
+# Disabled lto flags on i686 to avoid lto memory allocation error
+%ifarch i686
+%global _lto_cflags %{nil}
+%endif
 
-%global tarversion 0.19.8.1
-%global archiveversion 0.19.8
-
-Summary: GNU libraries and utilities for producing multi-lingual messages
+Summary: GNU tools and libraries for localized translated messages
 Name: gettext
-Version: 0.19.8.1
-Release: 9%{?dist}
-License: GPLv3+ and LGPLv2+
-Group: Development/Tools
-URL: http://www.gnu.org/software/gettext/
-Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{tarversion}.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
-# Upstreamed patch:
-# http://lists.gnu.org/archive/html/bug-gettext/2016-08/msg00006.html
-Patch1: gettext-po-send-mail.patch
+Version: 0.26
+Release: 3%{?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: GPL-3.0-or-later and LGPL-2.0-or-later and GFDL-1.2-or-later
+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: gettext-0.21.1-covscan.patch
+Patch2: gettext-0.26-c23.diff
+Patch3: gettext-0.26-stdcountof-h.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
@@ -40,26 +52,32 @@ BuildRequires: zip, unzip
 %endif
 # for po-mode.el
 BuildRequires: emacs
-# for autosetup
-BuildRequires: git
 # ensure 'ARCHIVE_FORMAT=dirxz'
 BuildRequires: xz
-BuildRequires: chrpath
+# 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: libcroco-devel
+BuildRequires: libacl-devel
 BuildRequires: libunistring-devel
-Requires(post): info
-Requires(preun): info
-# Depend on the exact version of the library sub package
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
-# 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)
+Requires: %{name}-runtime = %{version}-%{release}
+Requires: libtextstyle%{?_isa} = %{version}-%{release}
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -74,11 +92,25 @@ 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: GPL-3.0-or-later and LGPL-2.0-or-later
+# 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+
+License: GPL-3.0-or-later
 BuildArch: noarch
 
 %description common-devel
@@ -87,17 +119,15 @@ 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: LGPL-2.0-or-later and GPL-3.0-or-later and GFDL-1.2-or-later
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-common-devel = %{version}-%{release}
-Requires(post): info
-Requires(preun): info
 Requires: xz
+Requires: diffutils
 Obsoletes: gettext-autopoint < 0.18.1.1-3
 Provides: gettext-autopoint = %{version}-%{release}
 
@@ -110,18 +140,34 @@ 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+
+License: LGPL-2.0-or-later and GPL-3.0-or-later
+Requires: libtextstyle%{?_isa} = %{version}-%{release}
 
 %description libs
 This package contains libraries used internationalization support.
 
+%package -n libtextstyle
+Summary: Text styling library
+License: GPL-3.0-or-later
+
+%description -n libtextstyle
+Library for producing styled text to be displayed in a terminal
+emulator.
+
+%package -n libtextstyle-devel
+Summary: Development files for libtextstyle
+License: GPL-3.0-or-later and GFDL-1.2-or-later
+Requires: libtextstyle%{?_isa} = %{version}-%{release}
+
+%description -n libtextstyle-devel
+This package contains all development related files necessary for
+developing or compiling applications/libraries that needs text
+styling.
 
 %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
@@ -141,8 +187,27 @@ 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
-%autosetup -n %{name}-%{tarversion} -S git
+%setup -q
+%patch 1 -p1 -b .orig~
+%patch 2 -p1 -b .orig~
+%patch 3 -p1 -b .orig~
+autoreconf
+
+# 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
@@ -156,9 +221,13 @@ export JAR=fastjar
 # prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
 export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
 %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 \
+# 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"
+export CFLAGS="$CFLAGS -Wformat"
+%configure --enable-nls --disable-static \
+    --enable-shared --disable-csharp --disable-rpath \
 %if %{with java}
     --enable-java \
 %else
@@ -166,18 +235,24 @@ export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
 %endif
     --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
@@ -194,7 +269,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
 
@@ -230,69 +305,51 @@ 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
 
+# adapt to rpath removal
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$PWD/gettext-runtime/intl/.libs
+
 # override LIBUNISTRING to prevent reordering of lib objects
 make check LIBUNISTRING=-lunistring
-%endif
 
+%ldconfig_scriptlets libs
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir || :
-
-
-%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
-%exclude %{_bindir}/msghack
+%files -f %{name}-tools.lang
+%doc AUTHORS NEWS README THANKS
+%doc gettext-tools/misc/disclaim-translations.txt
+%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*
+%exclude %{_mandir}/man1/envsubst.1*
+%exclude %{_mandir}/man1/gettextize.1*
 %exclude %{_mandir}/man1/msghack.1*
-%{_mandir}/man1/*
+%{_mandir}/man1/msg*
+%{_mandir}/man1/recode*.1*
+%{_mandir}/man1/xgettext.1*
 %{_libdir}/%{name}
 %if %{with java}
 %exclude %{_libdir}/%{name}/gnu.gettext.*
@@ -302,29 +359,68 @@ fi
 %{_datadir}/%{name}/ABOUT-NLS
 %{_datadir}/%{name}/po
 %{_datadir}/%{name}/styles
-%dir %{_datadir}/%{name}-%{archiveversion}
-%{_datadir}/%{name}-%{archiveversion}/its
+%{_datadir}/%{name}/disclaim-translations.txt
+%dir %{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}-%{version}/its
+%dir %{_datadir}/%{name}/schema
+%{_datadir}/%{name}/schema/its*.xsd*
+%{_datadir}/%{name}/schema/locating-rules.xsd*
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/cldr-plurals
+%{_libexecdir}/%{name}/hostname
+%{_libexecdir}/%{name}/project-id
+%{_libexecdir}/%{name}/urlget
+%{_libexecdir}/%{name}/user-email
+
+%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
+%{_bindir}/printf_gettext
+%{_bindir}/printf_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/
 %{_datadir}/%{name}/config.rpath
 %{_datadir}/%{name}/*.h
 %{_datadir}/%{name}/msgunfmt.tcl
-%{_datadir}/aclocal/*
-%{_includedir}/*
+%{_datadir}/%{name}/m4/*
+%{_datadir}/aclocal/nls.m4
+%{_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}
@@ -340,6 +436,16 @@ fi
 %{_datadir}/%{name}/libintl.jar
 %endif
 
+%files -n libtextstyle
+%{_libdir}/libtextstyle.so.0*
+
+%files -n libtextstyle-devel
+%{_docdir}/libtextstyle/
+%{_includedir}/textstyle/
+%{_includedir}/textstyle.h
+%{_infodir}/libtextstyle*
+%{_libdir}/libtextstyle.so
+
 %files -n emacs-%{name}
 %dir %{_emacs_sitelispdir}/%{name}
 %{_emacs_sitelispdir}/%{name}/*.elc
@@ -352,6 +458,236 @@ fi
 %{_mandir}/man1/msghack.1*
 
 %changelog
+* Sun Jan 11 2026 Manish Tiwari <matiwari@redhat.com> - 0.26-3
+- https://lists.gnu.org/archive/html/bug-gnulib/2025-09/msg00095.html
+- Upstream patch to fix implicit declaration error with GCC-16
+
+* Thu Dec 18 2025 Manish Tiwari <matiwari@redhat.com> - 0.26-2
+- Add upstream provided patch to fix build failure with glibc 2.42 C23 const-preserving macros
+- https://lists.gnu.org/archive/html/bug-gnulib/2025-11/msg00220.html
+
+* Tue Aug 19 2025 Manish Tiwari <matiwari@redhat.com> - 0.26-1
+- update to 0.26 release
+- https://savannah.gnu.org/news/?id=10789
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed Jul 23 2025 Manish Tiwari <matiwari@redhat.com> - 0.25.1-1
+- update to 0.25.1 release
+- Bug fixes:
+- autopoint no longer fails if configure.ac contains no AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION invocation.
+- nls.m4 is installed again under $PREFIX/share/aclocal/.
+
+* Mon May 12 2025 Manish Tiwari <matiwari@redhat.com> - 0.25-1
+- update to 0.25 release
+- https://savannah.gnu.org/news/?id=10769
+
+* Thu Feb 27 2025 Manish Tiwari <matiwari@redhat.com> - 0.24-1
+- update to 0.24 release
+- https://savannah.gnu.org/news/?id=10730
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jan 1 2025 Manish Tiwari <matiwari@redhat.com> - 0.23.1-1
+- update to 0.23.1 release
+- Remove gettext-0.23-libxml2 patch
+
+* Wed Dec 11 2024 Manish Tiwari <matiwari@redhat.com> - 0.23-1
+- update to 0.23 release
+- https://savannah.gnu.org/news/?id=10699
+- Add patch to fix compilation error with libxml2 >= 2.12.0 and gcc >= 14.
+- Remove gettext-0.22-disable-libtextstyle patch
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jul 11 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.5-5
+- CI gating tests migration to tmt
+
+* Thu Jul 4 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.5-4
+- Add explicit package version requirement for libtextstyle
+
+* Tue Jul 2 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.5-3
+- Add back libtextstyle for f40 (#2278984)
+
+* Fri Mar  8 2024 Jens Petersen <petersen@redhat.com> - 0.22.5-2
+- condition libtextstyle obsoletes
+
+* Mon Mar 4 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.5-1
+- update to 0.22.5 release
+- https://savannah.gnu.org/news/?id=10597
+
+* Wed Feb 21 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.4-2
+- Add back libtextstyle library for rawhide (#2264128)
+
+* Fri Feb 9 2024 Manish Tiwari <matiwari@redhat.com> - 0.22.4-1
+- update to 0.22.4 release
+- https://savannah.gnu.org/news/?id=10544
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 23 2023 Jens Petersen <petersen@redhat.com> - 0.22-1
+- update to 0.22 release
+- https://savannah.gnu.org/news/?id=10378
+
+* Wed Mar 29 2023 Sundeep Anand <suanand@redhat.com> - 0.21.1-3
+- update license tag to as per SPDX identifiers
+
+* 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
 
@@ -613,13 +949,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.
 
@@ -737,7 +1073,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
@@ -902,7 +1238,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>
@@ -992,7 +1328,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>
diff --git a/plans/basic.fmf b/plans/basic.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/basic.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/sources b/sources
index 5cf8953..2017c93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df3f5690eaa30fd228537b00cb7b7590  gettext-0.19.8.1.tar.xz
+SHA512 (gettext-0.26.tar.gz) = 6c2afb0737843028e1cd27f1cd7dd5b81372ccff8cd8e01e17cfdc517afdd9a849c232f1ff5adca5eb4b03f2cc64f4a3f689ae8b84e523ceeae85384f3844083
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..2ff84b6
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,5 @@
+summary: Run gettext test
+test: ./test.sh
+framework: beakerlib
+require:
+  - gettext
diff --git a/tests/test.sh b/tests/test.sh
new file mode 100755
index 0000000..507b6c5
--- /dev/null
+++ b/tests/test.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="gettext"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "cp test_i18n.py test_gettext.py $TmpDir"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlLog "Run test_gettext.py"
+        rlRun "python3 test_gettext.py"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/test_gettext.py b/tests/test_gettext.py
new file mode 100644
index 0000000..3bda128
--- /dev/null
+++ b/tests/test_gettext.py
@@ -0,0 +1,227 @@
+# -*- coding: utf-8 -*-
+
+import logging
+import os
+import subprocess
+
+
+# Saving logs
+logging.basicConfig(level=logging.INFO)
+
+DECORATE_STR = "************************************"
+logging.info("TEST RESULTS FOR GETTEXT\n{0}".format(DECORATE_STR))
+
+# CONSTANTS
+PACKAGE_TO_TEST = "gettext"
+DOMAIN_TO_BIND = "testdomain"
+PYTHON_INTERPRETER = "python3"
+TEST_I18N_FILE = "test_i18n.py"
+
+LOG_INFO_PASS = "[ PASS ]"
+LOG_INFO_FAIL = "[ FAIL ]"
+LOG_INFO_OS_ERROR = "[ OS Error ]"
+
+# Test Data
+TEST_DATA = {"fr_FR": '''msgstr "Bonjour le monde!"''',
+             "de_DE": '''msgstr "Hallo Welt!"''',
+             "es_ES": '''msgstr "Hola Mundo!"''',
+             "it_IT": '''msgstr "Ciao mondo!"''',
+             "pt_BR": '''msgstr "Olá Mundo!"''',
+             "ja_JP": '''msgstr "「こんにちは世界」"''',
+             "ko_KR": '''msgstr "안녕하세요!"''',
+             "ru_RU": '''msgstr "Привет мир!"''',
+             "zh_CN": '''msgstr "你好，世界！"''',
+             "zh_TW": '''msgstr "你好，世界！"'''}
+
+
+def test_locale():
+    """
+    Check common files for locale support
+    """
+
+    subject = "Locale Support Test"
+
+    try:
+        all_locales = subprocess.Popen(["locale", "-a"], stdout=subprocess.PIPE)
+        all_locales_data = all_locales.communicate()
+
+        if all_locales_data:
+            actual = all_locales_data[0].decode().split('\n')
+        else:
+            logging.error("{0}: ERROR\n".format(subject))
+            return
+
+        expected_locales = ['en_US', 'en_US.iso88591',
+                            'en_US.iso885915', 'en_US.utf8']
+        if set(expected_locales).issubset(set(actual)):
+            logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
+        else:
+            logging.error("{0}: {1}\n".format(subject, LOG_INFO_FAIL))
+
+    except OSError as e:
+        logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
+
+
+def test_gettext():
+    """
+    Check if gettext is present
+    """
+
+    subject = "GNU Internationalization Utilities Test"
+
+    try:
+        cmd_check_gettext = ['rpm', '-q', PACKAGE_TO_TEST]
+        p1 = subprocess.Popen(cmd_check_gettext, stdout=subprocess.PIPE)
+        std_data, stderr = p1.communicate()
+        std_data = std_data.decode()
+        logging.info("Found {0} NVR: {1}".format(PACKAGE_TO_TEST, std_data))
+        if PACKAGE_TO_TEST in std_data:
+            logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
+        else:
+            logging.error("{0}: {1}\n".format(subject, LOG_INFO_FAIL))
+    except OSError as e:
+        logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
+
+
+def test_pot_creation():
+    """
+    Creates hello.pot file using test_i18n.py file
+    """
+
+    subject = "POT file Creation Test"
+
+    try:
+        pot_file = subprocess.Popen(
+            "xgettext -d '{0}' -o {1}.pot {2}".format(DOMAIN_TO_BIND,
+                                                      DOMAIN_TO_BIND,
+                                                      TEST_I18N_FILE),
+            shell=True
+        )
+        pot_file.communicate()
+    except OSError as e:
+        logging.error("{0}: {1}\n".format(subject, LOG_INFO_OS_ERROR))
+    else:
+        logging.info("{0}: {1}\n".format(subject, LOG_INFO_PASS))
+
+
+def make_dir(locale_dir):
+    path = "./locale/{0}/LC_MESSAGES".format(locale_dir)
+    os.makedirs(path)
+
+
+def create_po_files(active_locale):
+    """
+    creates .po file using POT file
+    """
+
+    subject = "PO file Creation"
+
+    try:
+        cmd_po_files = subprocess.Popen(
+            "msginit --no-translator -l {0} -i {1}.pot -o ./locale/{2}/LC_MESSAGES/{3}.po".format(
+                active_locale, DOMAIN_TO_BIND, active_locale, active_locale), shell=True
+        )
+        cmd_po_files.communicate()
+    except OSError as e:
+        logging.error("{0} failed: {1}\n".format(subject, LOG_INFO_OS_ERROR))
+    else:
+        logging.info("{0} Succeed.".format(subject))
+
+
+def translate(active_locale):
+    """
+    Updates .po file with the translations for respective language
+    """
+
+    data = TEST_DATA.get(active_locale)
+    if not data:
+        return
+    with open('./locale/{0}/LC_MESSAGES/{1}.po'.format(active_locale,
+                                                       active_locale),
+              'r', encoding='latin-1') as f1:
+        data1 = f1.readlines()
+        data1.pop()
+        data1.append(data)
+        for index, data in enumerate(data1):
+            if "Content-Type" in data:
+                data1[index] = '"Content-Type: text/plain; charset=UTF-8\\n"\n'
+
+    with open('./locale/{0}/LC_MESSAGES/{1}'.format(active_locale,
+                                                    active_locale) + ".po", 'w') as f2:
+        for line in data1:
+            f2.write(line)
+
+
+def create_mo_files(active_locale):
+    """
+    Creates .mo file for different locale form .po file
+    """
+
+    subject = "MO file Creation"
+
+    try:
+        mo_files = subprocess.Popen(
+            "msgfmt ./locale/{0}/LC_MESSAGES/{1}.po --output-file ./locale/{2}/LC_MESSAGES/{3}.mo".format(
+                active_locale, active_locale, active_locale, active_locale
+            ), shell=True
+        )
+        mo_files.communicate()
+    except OSError as e:
+        logging.error("{0} failed: {1}\n".format(subject, LOG_INFO_OS_ERROR))
+    else:
+        logging.info("{0} Succeed.".format(subject))
+
+
+def test_translations(active_locale):
+    """
+    Verify if the output is correct for different language
+    """
+
+    subject = "Translation Test"
+
+    try:
+        cmd_translation_test = subprocess.check_output(
+            'LANGUAGE={0} {1} {2} {3}'.format(active_locale,
+                                              PYTHON_INTERPRETER,
+                                              TEST_I18N_FILE,
+                                              active_locale),
+            encoding='UTF-8', shell=True
+        )
+        if cmd_translation_test.strip() == TEST_DATA[active_locale].strip('msgstr "'):
+            logging.info("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_PASS))
+        else:
+            logging.error("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_FAIL))
+    except OSError as e:
+        logging.error("{0} for {1}: {2}\n".format(subject, active_locale, LOG_INFO_OS_ERROR))
+
+
+def tear_off():
+    try:
+        subprocess.call(['rm', '-rf', './locale', '{0}.pot'.format(DOMAIN_TO_BIND)])
+    except OSError as e:
+        logging.error("OSError\n")
+
+
+if __name__ == "__main__":
+    """
+    Gettext Tests
+    """
+
+    # Prepare tests
+    env_tests = [test_locale,
+                 test_gettext,
+                 test_pot_creation]
+
+    translation_tests = [make_dir,
+                         create_po_files,
+                         translate,
+                         create_mo_files,
+                         test_translations]
+
+    # Execute tests
+    [env_test() for env_test in env_tests]
+
+    for locale in TEST_DATA.keys():
+        [test(locale) for test in translation_tests]
+
+    tear_off()
diff --git a/tests/test_i18n.py b/tests/test_i18n.py
new file mode 100644
index 0000000..84a3318
--- /dev/null
+++ b/tests/test_i18n.py
@@ -0,0 +1,14 @@
+import gettext
+import sys
+
+
+def print_message(locale):
+    # Set up message catalog access
+    t = gettext.translation('%s' % locale, 'locale', fallback=True)
+    _ = t.gettext
+
+    s = _('Hello World!')
+    print(s)
+
+
+print_message(sys.argv[1])