diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 45b81bd..59ae323 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,8 +1,29 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- 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 7fbd14b..50cbc61 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%{?with_mini:-mini} = %{version} # autopoint requires find Requires: findutils # For non-UTF encodings @@ -139,6 +141,17 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation 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 +environment. + %if %{without mini} %package -n libtextstyle0 Summary: Provides textstyling for console output @@ -278,7 +291,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 +298,6 @@ make check || { %doc %_docdir/%name/FAQ.html %_bindir/gettext %_bindir/ngettext -%_bindir/envsubst %_bindir/gettext.sh %_bindir/msgfmt %_libdir/libgettextlib-*.so @@ -294,7 +305,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 +315,12 @@ make check || { %_datadir/emacs/site-lisp/start-po.* %_datadir/emacs/site-lisp/suse-start-po-mode.el +%files -n envsubst%{?with_mini:-mini} +%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]* diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 45b81bd..59ae323 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,8 +1,29 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- 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..b6ba16e 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%{?with_mini:-mini} = %{version} # autopoint requires find Requires: findutils # For non-UTF encodings @@ -139,6 +141,17 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation 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 +environment. + %if %{without mini} %package -n libtextstyle0 Summary: Provides textstyling for console output @@ -278,7 +291,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 +298,6 @@ make check || { %doc %_docdir/%name/FAQ.html %_bindir/gettext %_bindir/ngettext -%_bindir/envsubst %_bindir/gettext.sh %_bindir/msgfmt %_libdir/libgettextlib-*.so @@ -294,7 +305,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 +315,12 @@ make check || { %_datadir/emacs/site-lisp/start-po.* %_datadir/emacs/site-lisp/suse-start-po-mode.el +%files -n envsubst%{?with_mini:-mini} +%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]*