diff --git a/.gitignore b/.gitignore index ba41be7..148acf2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /x11docker-6.9.0.tar.gz +/x11docker-7.6.0.tar.gz diff --git a/369.patch b/369.patch deleted file mode 100644 index 9182e41..0000000 --- a/369.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ae56039cf049fc3753347ff2b641d41592604cab Mon Sep 17 00:00:00 2001 -From: Davide Cavalca -Date: Sun, 13 Jun 2021 18:02:42 -0700 -Subject: [PATCH] Use /usr/bin/tini-static for tini if available - ---- - x11docker | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/x11docker b/x11docker -index 068f34d..148a8bb 100755 ---- a/x11docker -+++ b/x11docker -@@ -4521,6 +4521,7 @@ setup_initsystem() { # option init: set up capabilities, check or cre - Tinibinaryfile="$(command -v docker-init ||:)" - [ -z "$Tinibinaryfile" ] && Tinibinaryfile="/snap/docker/current/bin/docker-init" - [ -e "$Tinibinaryfile" ] || Tinibinaryfile="/snap/docker/current/usr/bin/docker-init" -+ [ -e "/usr/bin/tini-static" ] && Tinibinaryfile="/usr/bin/tini-static" - [ -e "/usr/local/share/x11docker/tini-static" ] && Tinibinaryfile="/usr/local/share/x11docker/tini-static" - [ -e "$Hostuserhome/.local/share/x11docker/tini-static" ] && Tinibinaryfile="$Hostuserhome/.local/share/x11docker/tini-static" - Tinibinaryfile="$(myrealpath "$Tinibinaryfile" 2>/dev/null ||:)" diff --git a/changelog b/changelog new file mode 100644 index 0000000..5fe3815 --- /dev/null +++ b/changelog @@ -0,0 +1,18 @@ +* Sat Jan 21 2023 Fedora Release Engineering - 6.9.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 6.9.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 6.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 6.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 14 2021 Davide Cavalca - 6.9.0-2 +- Make weston dependency conditional on Wayland being installed +- Fix binary install + +* Sun Jun 13 2021 Davide Cavalca - 6.9.0-1 +- Initial package diff --git a/sources b/sources index 6473b4f..533cecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x11docker-6.9.0.tar.gz) = 1a537115f50c3fa482dad95631460134a456d569cffbc36412e698f7f4600cc56c7febc6dcbbc43506e270cb06df9f994ef9b2c91f6cfcd2412bb65f2a6add22 +SHA512 (x11docker-7.6.0.tar.gz) = 9cc6f4fb0bb87fed6aa37457278ad79bf3ba603c8c80b3af8a14fb150efffa6687dfad6509cb0f9a38517b550c56a91737892caaed3d62ca776136b5629f3ccc diff --git a/x11docker-podman-default.patch b/x11docker-podman-default.patch index 759fe1c..9c10474 100644 --- a/x11docker-podman-default.patch +++ b/x11docker-podman-default.patch @@ -1,22 +1,32 @@ -diff --git a/x11docker b/x11docker -index 068f34d..3b7ea01 100755 ---- a/x11docker -+++ b/x11docker -@@ -263,7 +263,7 @@ Container init system, elogind and DBus daemon: +diff -Naur a/x11docker b/x11docker +--- a/x11docker 2023-01-18 08:46:57.000000000 -0800 ++++ b/x11docker 2023-05-25 21:54:39.850870442 -0700 +@@ -12,7 +12,7 @@ + # More documentation at: https://github.com/mviereck/x11docker - Container special configuration: - --backend=BACKEND Container backend to use: docker, podman or nerdctl. -- Default: docker. -+ Default: podman. - For rootful podman or nerdctl use sudo or option --pw. - For rootless docker set DOCKER_HOST accordingly. - - If using nerdctl please provide a container command -@@ -8560,7 +8560,7 @@ declare_variables() { # declare global variables - Allownewprivileges="auto" # --newprivileges: Docker run option --security-opt=no-new-privileges. Default: no. Enabled by options --newprivileges, --cap-default, --sudouser and --user=root. - Capabilities="" # Capabilities to add. Default: none, exceptions for --init, --sudouser - Capdropall="yes" # --cap-default: Drop all container capabilities and set --securty-opt=no-new-privileges yes/no -- Containerbackend="docker" # --backend: Backend to use, like docker, podman, nerdctl, udocker -+ Containerbackend="podman" # --backend: Backend to use, like docker, podman, nerdctl, udocker - Containerbackendbin="" # path to binary of backend - Containercommand="" # Container command [+args] - Containerenvironment="" # --env: Environment variables + Version="7.6.0" +-Packagedversion="no" # Set to "yes" if you want to package x11docker. This disables installation options. ++Packagedversion="yes" # Set to "yes" if you want to package x11docker. This disables installation options. + + # --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups. (deprecated) + grep -q -- "--enforce-i" <<< "$*" && case $- in +@@ -95,8 +95,8 @@ + -i, --interactive Run with an interactive tty to allow shell commands. + Useful with commands like bash. + --backend=BACKEND Container backend to use. BACKEND can be: +- docker (recommended for rootful) (default) +- podman (recommended for rootless and rootful) ++ docker (recommended for rootful) ++ podman (recommended for rootless and rootful) (default) + nerdctl (experimental) + host Run a host application, no container. + --rootless [=yes|no] Use (or disallow) rootless backend. +@@ -9584,7 +9584,7 @@ + ;; + esac + } +- Backend="${Backend:-docker}" ++ Backend="${Backend:-podman}" + case "$Backend" in + docker|podman|nerdctl|proot|host) ;; + *) diff --git a/x11docker.spec b/x11docker.spec index 7f57a19..c575b34 100644 --- a/x11docker.spec +++ b/x11docker.spec @@ -1,6 +1,6 @@ Name: x11docker -Version: 6.9.0 -Release: 2%{?dist} +Version: 7.6.0 +Release: %autorelease Summary: Run GUI applications and desktops in Linux containers License: MIT @@ -8,8 +8,6 @@ URL: https://github.com/mviereck/x11docker Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Default to the podman backend instead of docker Patch0: x11docker-podman-default.patch -# Use /usr/bin/tini-static for tini if available -Patch1: %{url}/pull/369.patch BuildArch: noarch @@ -40,17 +38,13 @@ Linux containers. %install install -Dpm0755 x11docker %{buildroot}%{_bindir}/x11docker -# x11docker-gui depends on kaptain, which is not packaged yet +install -Dpm0644 x11docker.man %{buildroot}%{_mandir}/man1/x11docker.1 %files %license LICENSE.txt %doc README.md CHANGELOG.md TODO.md paper.bib paper.md x11docker.png %{_bindir}/x11docker +%{_mandir}/man1/x11docker.1* %changelog -* Mon Jun 14 2021 Davide Cavalca - 6.9.0-2 -- Make weston dependency conditional on Wayland being installed -- Fix binary install - -* Sun Jun 13 2021 Davide Cavalca - 6.9.0-1 -- Initial package +%autochangelog