From 99f0b0392c4b761e31236f964319470ac4f9575cd98fd870bac644bc09fdc01d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 2 Jun 2024 09:58:50 +0000 Subject: [PATCH 1/4] 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 - Require glibc-gconv-modules-extra by the gettext-tools packages +------------------------------------------------------------------- +Tue May 14 10:06:12 UTC 2024 - Dan Čermák + +- 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 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]* From 68ddeeda34af27a2c692012880230b88b963bad9be17e04690a2d7621728c954 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 4 Jun 2024 08:20:54 +0000 Subject: [PATCH 2/4] Accepting request 1178266 from home:dancermak:branches:Base:System sync envsubst change with gettext-runtime-mini OBS-URL: https://build.opensuse.org/request/show/1178266 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=196 --- gettext-runtime-mini.changes | 5 +++++ gettext-runtime-mini.spec | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 45b81bd..0ae1f78 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 3 09:41:40 UTC 2024 - Dan Čermák + +- sync envsubst change with gettext-runtime-mini + ------------------------------------------------------------------- Tue May 21 10:25:25 UTC 2024 - Andreas Schwab diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 7fbd14b..08b21ad 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.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]* From 184598d071eceeec259bc85d2e1105f64b0cc34e8d53ab546214d41296af9544 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 6 Jun 2024 13:08:18 +0000 Subject: [PATCH 3/4] Accepting request 1178475 from home:dancermak:branches:Base:System add optional -mini suffix to envsubst package OBS-URL: https://build.opensuse.org/request/show/1178475 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=197 --- gettext-runtime-mini.changes | 5 +++++ gettext-runtime-mini.spec | 6 +++--- gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 0ae1f78..fdbbc29 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 4 09:37:07 UTC 2024 - Dan Čermák + +- add optional -mini suffix to envsubst package + ------------------------------------------------------------------- Mon Jun 3 09:41:40 UTC 2024 - Dan Čermák diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 08b21ad..60385c6 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -141,10 +141,10 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. -%package -n envsubst +%package -n envsubst%{?with_mini:-mini} Summary: Environment substitution helper binary -%description -n envsubst +%description -n envsubst%{?with_mini:-mini} This package contains the envsubst helper binary to replace values from the environment. @@ -311,7 +311,7 @@ make check || { %_datadir/emacs/site-lisp/start-po.* %_datadir/emacs/site-lisp/suse-start-po-mode.el -%files -n envsubst +%files -n envsubst%{?with_mini:-mini} %license COPYING %_bindir/envsubst %doc %_mandir/man1/envsubst.1.gz diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 2416a5c..7ac3ae4 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 4 09:36:01 UTC 2024 - Dan Čermák + +- add optional -mini suffix to envsubst package + ------------------------------------------------------------------- Tue May 21 10:25:25 UTC 2024 - Andreas Schwab diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 26dd855..0f8b1c3 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -141,10 +141,10 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. -%package -n envsubst +%package -n envsubst%{?with_mini:-mini} Summary: Environment substitution helper binary -%description -n envsubst +%description -n envsubst%{?with_mini:-mini} This package contains the envsubst helper binary to replace values from the environment. @@ -311,7 +311,7 @@ make check || { %_datadir/emacs/site-lisp/start-po.* %_datadir/emacs/site-lisp/suse-start-po-mode.el -%files -n envsubst +%files -n envsubst%{?with_mini:-mini} %license COPYING %_bindir/envsubst %doc %_mandir/man1/envsubst.1.gz From 3f29b43de23400e4f8d49e477a3ed5ce598182f848ce6a726270d6044e561a6a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 6 Jun 2024 14:26:37 +0000 Subject: [PATCH 4/4] Accepting request 1179032 from home:dimstar:Factory I try again: address the issues between gettext-runtime and the -mini flavor: + envsubst-mini and envsubst need to conflict (as they do on file level) + Ensure envsubst-mini is never used outside of OBS with the relevant requires sync the changes and spec file by actually calling pre_checkin.sh - not syncing stuff manually OBS-URL: https://build.opensuse.org/request/show/1179032 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=198 --- gettext-runtime-mini.changes | 23 +++++++++++++++++------ gettext-runtime-mini.spec | 6 +++++- gettext-runtime.changes | 8 ++++++++ gettext-runtime.spec | 6 +++++- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index fdbbc29..59ae323 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,18 +1,29 @@ ------------------------------------------------------------------- -Tue Jun 4 09:37:07 UTC 2024 - Dan Čermák +Thu Jun 6 14:23:04 UTC 2024 - Dominique Leuenberger + +- Fix envsubst-mini: + + Conflicts with the 'full' envsubst + + Require 'this-is-only-for-build-envs': ensure this does not + find it's way out of OBS onto installations. + +------------------------------------------------------------------- +Tue Jun 4 09:36:01 UTC 2024 - Dan Čermák - add optional -mini suffix to envsubst package -------------------------------------------------------------------- -Mon Jun 3 09:41:40 UTC 2024 - Dan Čermák - -- sync envsubst change with gettext-runtime-mini - ------------------------------------------------------------------- Tue May 21 10:25:25 UTC 2024 - Andreas Schwab - Require glibc-gconv-modules-extra by the gettext-tools packages +------------------------------------------------------------------- +Tue May 14 10:06:12 UTC 2024 - Dan Čermák + +- 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 diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 60385c6..50cbc61 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -93,7 +93,7 @@ Group: Development/Tools/Other Requires: %{name} = %{version} Requires: xz # gettext.sh requires envsubst -Requires: envsubst = %{version} +Requires: envsubst%{?with_mini:-mini} = %{version} # autopoint requires find Requires: findutils # For non-UTF encodings @@ -143,6 +143,10 @@ as well as project examples. %package -n envsubst%{?with_mini:-mini} Summary: Environment substitution helper binary +%if %{with mini} +Conflicts: envsubst +Requires: this-is-only-for-build-envs +%endif %description -n envsubst%{?with_mini:-mini} This package contains the envsubst helper binary to replace values from the diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 7ac3ae4..59ae323 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 6 14:23:04 UTC 2024 - Dominique Leuenberger + +- Fix envsubst-mini: + + Conflicts with the 'full' envsubst + + Require 'this-is-only-for-build-envs': ensure this does not + find it's way out of OBS onto installations. + ------------------------------------------------------------------- Tue Jun 4 09:36:01 UTC 2024 - Dan Čermák diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 0f8b1c3..b6ba16e 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -93,7 +93,7 @@ Group: Development/Tools/Other Requires: %{name} = %{version} Requires: xz # gettext.sh requires envsubst -Requires: envsubst = %{version} +Requires: envsubst%{?with_mini:-mini} = %{version} # autopoint requires find Requires: findutils # For non-UTF encodings @@ -143,6 +143,10 @@ as well as project examples. %package -n envsubst%{?with_mini:-mini} Summary: Environment substitution helper binary +%if %{with mini} +Conflicts: envsubst +Requires: this-is-only-for-build-envs +%endif %description -n envsubst%{?with_mini:-mini} This package contains the envsubst helper binary to replace values from the