forked from pool/gettext-runtime
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
This commit is contained in:
parent
184598d071
commit
3f29b43de2
@ -1,18 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 4 09:37:07 UTC 2024 - Dan Čermák <dcermak@suse.com>
|
||||
Thu Jun 6 14:23:04 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- 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 <dcermak@suse.com>
|
||||
|
||||
- add optional -mini suffix to envsubst package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 3 09:41:40 UTC 2024 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- sync envsubst change with gettext-runtime-mini
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 6 14:23:04 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- 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 <dcermak@suse.com>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user