From 3f29b43de23400e4f8d49e477a3ed5ce598182f848ce6a726270d6044e561a6a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 6 Jun 2024 14:26:37 +0000 Subject: [PATCH] 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