Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package distrobox for openSUSE:Factory checked in at 2022-09-15 22:58:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/distrobox (Old) and /work/SRC/openSUSE:Factory/.distrobox.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "distrobox" Thu Sep 15 22:58:53 2022 rev:7 rq:1003684 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/distrobox/distrobox.changes 2022-07-29 16:47:41.846619113 +0200 +++ /work/SRC/openSUSE:Factory/.distrobox.new.2083/distrobox.changes 2022-09-15 22:59:51.749329246 +0200 @@ -1,0 +2,26 @@ +Wed Sep 14 09:24:10 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Update to latest version (1.4.0) +- Patches removed: + 0001-enter-fix-automatic-container-creation-when-r-is-use.patch + 0002-distrobox-handle-situations-with-weird-manpages-setu.patch + 0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch + 0003-distrobox-if-no-command-is-specified-default-to-ente.patch + 0004-opensuse-check-for-the-config-file-in-usr-etc-too.patch +- Patches added: + 0001-distrobox-if-no-command-is-specified-default-to-ente.patch +- Changes in 1.4.0: + * New distrobox upgrade command, to update all the containers at once + * New distrobox generate-entry command, to add your distrobox to the app list + note that from 1.4.0 onwards this will be the default behaviour for all the + new containers created + * New distrobox ephemeral command, to quickly spawn, use and delete a container. + All-in-one. + * New install-podman script to install Podman in $HOME. Handy for @ValveSoftware + SteamDeck users + * Distrobox-host-exec now uses exclusively the host-spawn command from @1player + * Better support for AD/LDap and Kerberos usernames + * Better support for Nix/Guix hosts + * Plenty of bug fixes and CI/Test improvements smile + +------------------------------------------------------------------- @@ -4 +30 @@ -- Fix a (potential) problem with man and manpages +- Fix a (potential0 problem with man and manpages Old: ---- 0001-enter-fix-automatic-container-creation-when-r-is-use.patch 0002-distrobox-handle-situations-with-weird-manpages-setu.patch 0003-distrobox-if-no-command-is-specified-default-to-ente.patch 0004-opensuse-check-for-the-config-file-in-usr-etc-too.patch distrobox-1.3.1.tar.gz New: ---- 0001-distrobox-if-no-command-is-specified-default-to-ente.patch distrobox-1.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ distrobox.spec ++++++ --- /var/tmp/diff_new_pack.yIwomk/_old 2022-09-15 22:59:52.189330488 +0200 +++ /var/tmp/diff_new_pack.yIwomk/_new 2022-09-15 22:59:52.193330500 +0200 @@ -16,26 +16,22 @@ # Name: distrobox -Version: 1.3.1 +Version: 1.4.0 Release: 0 Summary: Use any linux distribution inside your terminal License: GPL-3.0 URL: https://github.com/89luca89/distrobox Source: distrobox-%{version}.tar.gz Source1: distrobox.conf -# Fix a problem with automatic rootful container creation (from upstream) -Patch1: 0001-enter-fix-automatic-container-creation-when-r-is-use.patch -# Fix a problem if man is there but actual manpages are stripped (from upstream PR) -Patch2: 0002-distrobox-handle-situations-with-weird-manpages-setu.patch # Default to distrobox-enter when just distrobox is used -Patch3: 0003-distrobox-if-no-command-is-specified-default-to-ente.patch -# Read the config from vendor specific directory (/usr/etc/distrobox) too -Patch4: 0004-opensuse-check-for-the-config-file-in-usr-etc-too.patch +Patch1: 0001-distrobox-if-no-command-is-specified-default-to-ente.patch Requires: %{_bindir}/basename Requires: %{_bindir}/find Requires: %{_bindir}/grep Requires: %{_bindir}/sed Requires: (%{_bindir}/podman or %{_bindir}/docker) +BuildRequires: hicolor-icon-theme +BuildRequires: ImageMagick BuildArch: noarch %description @@ -51,10 +47,11 @@ %build %install -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_docdir}/%{name} ./install --prefix %{buildroot}/%{_prefix} + +install -d -m0755 %{buildroot}%{_docdir}/%{name} install -m 0644 docs/*.md %{buildroot}%{_docdir}/%{name} + %if 0%{?suse_version} > 1500 mkdir -p %{buildroot}%{_distconfdir}/distrobox install -m 0644 %{SOURCE1} %{buildroot}%{_distconfdir}/distrobox/distrobox.conf @@ -62,6 +59,19 @@ mkdir -p %{buildroot}%{_sysconfdir}/distrobox install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/distrobox/distrobox.conf %endif + +# Move the icon +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/1200x1200/apps +mv %{buildroot}%{_datadir}/icons/terminal-distrobox-icon.png \ + %{buildroot}%{_datadir}/icons/hicolor/1200x1200/apps + +# Generate all the other icon sizes +for sz in 16 22 24 32 36 48 64 72 96 128 256; do + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps + convert terminal-distrobox-icon.png -resize ${sz}x${sz} \ + %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps/terminal-distrobox-icon.png +done + %files %license COPYING.md %doc %{_docdir}/%{name} @@ -70,13 +80,14 @@ %{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/%{name}-*.1.gz %if 0%{?suse_version} > 1500 -%{_distconfdir}/distrobox -%else -%config %{_sysconfdir}/distrobox -%endif -%if 0%{?suse_version} > 1500 +%dir %{_distconfdir}/distrobox %{_distconfdir}/distrobox/distrobox.conf %else +%config %{_sysconfdir}/distrobox %config(noreplace) %{_sysconfdir}/distrobox/distrobox.conf %endif +%dir %{_datadir}/icons/hicolor/ +%dir %{_datadir}/icons/hicolor/*x*/ +%dir %{_datadir}/icons/hicolor/*x*/apps/ +%{_datadir}/icons/hicolor/*/apps/terminal-distrobox-icon.png %changelog ++++++ 0003-distrobox-if-no-command-is-specified-default-to-ente.patch -> 0001-distrobox-if-no-command-is-specified-default-to-ente.patch ++++++ --- /work/SRC/openSUSE:Factory/distrobox/0003-distrobox-if-no-command-is-specified-default-to-ente.patch 2022-07-29 16:47:41.818619035 +0200 +++ /work/SRC/openSUSE:Factory/.distrobox.new.2083/0001-distrobox-if-no-command-is-specified-default-to-ente.patch 2022-09-15 22:59:51.729329189 +0200 @@ -1,22 +1,22 @@ -From 0f1a928d310ea35465f892ff0bda563d110a4ce7 Mon Sep 17 00:00:00 2001 +From a4f0fd0560c39d58472ef09e4228948e88012d33 Mon Sep 17 00:00:00 2001 From: Dario Faggioli <dfaggi...@suse.com> Date: Thu, 28 Jul 2022 10:10:28 +0200 -Subject: [PATCH 3/4] distrobox: if no command is specified, default to enter +Subject: [PATCH] distrobox: if no command is specified, default to enter If just `distrobox` is invoked, without any command, assume `distrobox enter`. Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- - distrobox | 19 ++++++++++++------- + distrobox | 18 ++++++++++++------ docs/README.md | 1 + - 2 files changed, 13 insertions(+), 7 deletions(-) + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/distrobox b/distrobox -index 4e37031..ce0469c 100755 +index 0f83b54..9b53547 100755 --- a/distrobox +++ b/distrobox -@@ -19,6 +19,11 @@ +@@ -19,6 +19,12 @@ # along with distrobox; if not, see <http://www.gnu.org/licenses/>. # POSIX @@ -25,42 +25,37 @@ + +default_command="enter" +[ -n "${DBX_DEFAULT_COMMAND}" ] && default_command="${DBX_DEFAULT_COMMAND}" ++ + set -o errexit + set -o nounset - trap '[ "$?" -ne 0 ] && printf "\nAn error occurred\n"' EXIT - -@@ -43,11 +48,6 @@ Choose one of the available commands: +@@ -48,15 +54,15 @@ Choose one of the available commands: EOF } --if [ $# -eq 0 ]; then ++distrobox_path="$(dirname "${0}")" + if [ $# -eq 0 ]; then - show_help - exit --fi -- - # Handle 'help' here, before setting 'errexit', so we have a chance - # to show our help if the man command is there but fails. - if [ "$1" = "help" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then -@@ -62,8 +62,13 @@ set -o errexit - set -o nounset - - distrobox_path="$(dirname "${0}")" --distrobox_command="${1}" --shift -+if [ $# -eq 0 ]; then + printf "No command specified. Assuming: distrobox-%s\n" "${default_command}" + distrobox_command="${default_command}" +else + distrobox_command="${1}" + shift -+fi + fi +-distrobox_path="$(dirname "${0}")" +-distrobox_command="${1}" +-shift +- # Simple wrapper to the distrobox utilities. # We just detect the 1st argument and launch the matching distrobox utility. + case "${distrobox_command}" in diff --git a/docs/README.md b/docs/README.md -index df00785..64e4c0d 100644 +index 8ec20bf..165985f 100644 --- a/docs/README.md +++ b/docs/README.md -@@ -268,6 +268,7 @@ Alternatively it is possible to specify preferences using ENV variables: +@@ -283,6 +283,7 @@ Alternatively it is possible to specify preferences using ENV variables: - DBX_CONTAINER_NAME - DBX_NON_INTERACTIVE - DBX_SKIP_WORKDIR @@ -69,5 +64,5 @@ --- -- -2.37.1 +2.37.3 ++++++ distrobox-1.3.1.tar.gz -> distrobox-1.4.0.tar.gz ++++++ ++++ 7351 lines of diff (skipped)
