From cd0b27eae3f046ffda461bae652c7b34f52569f2 Mon Sep 17 00:00:00 2001 From: GloriousEggroll Date: Sat, 12 Oct 2024 05:53:43 -0600 Subject: [PATCH] Release 1.1.2 --- .github/workflows/build-umu-ubuntu-noble.yml | 2 +- packaging/deb/debian/changelog | 6 +++--- .../org.openwinecomponents.umu.umu-launcher.yml | 2 +- packaging/nix/umu-launcher.nix | 2 +- packaging/rpm/umu-launcher.spec | 13 ++++++++++--- packaging/snap/snap/snapcraft.yaml | 4 ++-- umu/umu_runtime.py | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-umu-ubuntu-noble.yml b/.github/workflows/build-umu-ubuntu-noble.yml index 6b10d18cb..e7e5877eb 100644 --- a/.github/workflows/build-umu-ubuntu-noble.yml +++ b/.github/workflows/build-umu-ubuntu-noble.yml @@ -27,7 +27,7 @@ jobs: run: apt install -y dh-make dpkg-dev - name: Setup dh_make quilt files - run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.1 || true + run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.2 || true - name: Install apt build dependencies run: apt build-dep -y ./ diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog index 4d0bf2dc2..f8bf15505 100644 --- a/packaging/deb/debian/changelog +++ b/packaging/deb/debian/changelog @@ -1,5 +1,5 @@ -umu-launcher (1.1.1-2) noble; urgency=medium +umu-launcher (1.1.2-1) noble; urgency=medium - * 1.1.1 Release. + * 1.1.2 Release. - -- Tom Crider Fri, 03 Oct 2024 03:31:24 -0700 + -- Tom Crider Sat, 12 Oct 2024 05:49:24 -0700 diff --git a/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml b/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml index b53de0fe7..2d090a2f7 100644 --- a/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml +++ b/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml @@ -360,7 +360,7 @@ modules: sources: - type: git url: https://github.com/Open-Wine-Components/umu-launcher.git - tag: 1.1.1 + tag: 1.1.2 modules: # --- packaging --- - name: packaging diff --git a/packaging/nix/umu-launcher.nix b/packaging/nix/umu-launcher.nix index fe0379667..43dec16b8 100644 --- a/packaging/nix/umu-launcher.nix +++ b/packaging/nix/umu-launcher.nix @@ -1,7 +1,7 @@ {pyth1 ,python3Packages , umu-launcher, pkgs, ...}: python3Packages.buildPythonPackage { name = "umu-launcher"; - version = "1.1.1"; + version = "1.1.2"; src = umu-launcher; pyproject = false; depsBuildBuild = [ diff --git a/packaging/rpm/umu-launcher.spec b/packaging/rpm/umu-launcher.spec index c29edeb9d..ce5424e0c 100644 --- a/packaging/rpm/umu-launcher.spec +++ b/packaging/rpm/umu-launcher.spec @@ -1,5 +1,12 @@ -%define commit 12ebba1bea5006aaa0493d4d9e5d1ba1fe434ac1 -%define tag 1.1.1 +# Define the manual commit as a fallback +%define manual_commit b34df64f3a7e85e2ac589f0f910e6873e7038635 + +# Optionally define the tag +%define tag 1.1.2 +# Check if tag is defined and get the commit hash for the tag, otherwise use manual commit +%{!?tag: %global commit %{manual_commit}} +%{?tag: %global commit %(git rev-list -n 1 %{tag} 2>/dev/null || echo %{manual_commit})} + %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global build_timestamp %(date +"%Y%m%d") @@ -7,7 +14,7 @@ %global rel_build 1.%{build_timestamp}.%{shortcommit}%{?dist} Name: umu-launcher -Version: 1.1.1 +Version: 1.1.2 Release: %{rel_build} Summary: A tool for launching non-steam games with proton diff --git a/packaging/snap/snap/snapcraft.yaml b/packaging/snap/snap/snapcraft.yaml index 7e9d8323f..c47edfa1b 100644 --- a/packaging/snap/snap/snapcraft.yaml +++ b/packaging/snap/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: umu-launcher -version: '1.1.1' # You can set this to the appropriate version +version: '1.1.2' # You can set this to the appropriate version summary: UMU Launcher description: | UMU Launcher is a tool for managing and launching applications. @@ -171,7 +171,7 @@ parts: umu-run: plugin: dump source: https://github.com/Open-Wine-Components/umu-launcher.git - source-tag: 1.1.1 + source-tag: 1.1.2 build-packages: - git - make diff --git a/umu/umu_runtime.py b/umu/umu_runtime.py index 96eddbb27..bebaa2394 100644 --- a/umu/umu_runtime.py +++ b/umu/umu_runtime.py @@ -175,7 +175,7 @@ def _install_umu( log.debug("Removing: %s", var) # Remove the variable directory to avoid Steam Linux Runtime # related errors when creating it. Supposedly, it only happens - # when going from umu-launcher 0.1-RC4 -> 1.1.1 + # when going from umu-launcher 0.1-RC4 -> 1.1.1+ # See https://github.com/Open-Wine-Components/umu-launcher/issues/213#issue-2576708738 thread_pool.submit(rmtree, str(var))