From 99f0b0392c4b761e31236f964319470ac4f9575cd98fd870bac644bc09fdc01d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 2 Jun 2024 09:58:50 +0000
Subject: [PATCH] Accepting request 1174158 from
 home:dancermak:branches:Base:System

Split out envsubst into a separate package

OBS-URL: https://build.opensuse.org/request/show/1174158
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=195
---
 gettext-runtime.changes |  8 ++++++++
 gettext-runtime.spec    | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index 45b81bd..2416a5c 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -3,6 +3,14 @@ Tue May 21 10:25:25 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
 - Require glibc-gconv-modules-extra by the gettext-tools packages
 
+-------------------------------------------------------------------
+Tue May 14 10:06:12 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Split out envsubst into a separate package
+  This allows us to pull in envsubst into containers without enlarging them
+  substantially. Additionally, this binary is standalone and useful outside of
+  the context of gettext.
+
 -------------------------------------------------------------------
 Mon Apr 15 07:24:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index 4b61f99..26dd855 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -92,6 +92,8 @@ License:        LGPL-2.1-or-later
 Group:          Development/Tools/Other
 Requires:       %{name} = %{version}
 Requires:       xz
+# gettext.sh requires envsubst
+Requires:       envsubst = %{version}
 # autopoint requires find
 Requires:       findutils
 # For non-UTF encodings
@@ -139,6 +141,13 @@ BuildArch:      noarch
 This subpackage contains the HTML version of the gettext documentation
 as well as project examples.
 
+%package -n envsubst
+Summary:        Environment substitution helper binary
+
+%description -n envsubst
+This package contains the envsubst helper binary to replace values from the
+environment.
+
 %if %{without mini}
 %package     -n libtextstyle0
 Summary:        Provides textstyling for console output
@@ -278,7 +287,6 @@ make check || {
 %doc %dir %_docdir/%name/
 %doc %_docdir/%name/gettext.1.html
 %doc %_docdir/%name/ngettext.1.html
-%doc %_docdir/%name/envsubst.1.html
 %doc %_docdir/%name/*.3.html
 %doc %_docdir/%name/AUTHORS
 %doc %_docdir/%name/NEWS
@@ -286,7 +294,6 @@ make check || {
 %doc %_docdir/%name/FAQ.html
 %_bindir/gettext
 %_bindir/ngettext
-%_bindir/envsubst
 %_bindir/gettext.sh
 %_bindir/msgfmt
 %_libdir/libgettextlib-*.so
@@ -294,7 +301,6 @@ make check || {
 %_libdir/libasprintf.so.*
 %doc %_mandir/man1/gettext.1.gz
 %doc %_mandir/man1/ngettext.1.gz
-%doc %_mandir/man1/envsubst.1.gz
 %doc %_mandir/man1/msgfmt.1.gz
 %doc %_mandir/man3/*
 %_datadir/gettext/ABOUT-NLS
@@ -305,6 +311,12 @@ make check || {
 %_datadir/emacs/site-lisp/start-po.*
 %_datadir/emacs/site-lisp/suse-start-po-mode.el
 
+%files -n envsubst
+%license COPYING
+%_bindir/envsubst
+%doc %_mandir/man1/envsubst.1.gz
+%doc %_docdir/%name/envsubst.1.html
+
 %files -n gettext-tools%{?with_mini:-mini} -f gettext-tools.lang
 %defattr(-,root,root)
 %_bindir/msg[a-eg-u]*