Accepting request 1208676 from games:tools

OBS-URL: https://build.opensuse.org/request/show/1208676
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protontricks?expand=0&rev=5

0001-Fix-using-local-vdf-module.patch

@@ -0,0 +1,80 @@
+From b78c219b2441d6a9738ac56ba6aae74c177ea851 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Thu, 10 Oct 2024 13:46:03 +0200
+Subject: [PATCH] Fix using local vdf module
+
+---
+ setup.cfg                         | 1 -
+ src/protontricks/_vdf/__init__.py | 2 +-
+ src/protontricks/steam.py         | 2 +-
+ tests/conftest.py                 | 2 +-
+ tests/test_steam.py               | 2 +-
+ 5 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 7168136..44c9d3a 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -30,7 +30,6 @@ package_dir =
+ include_package_data = True
+ install_requires =
+     setuptools  # Required for pkg_resources
+-    vdf>=3.2
+     Pillow
+ setup_requires =
+     setuptools-scm
+diff --git a/src/protontricks/_vdf/__init__.py b/src/protontricks/_vdf/__init__.py
+index e79136b..722e6f5 100644
+--- a/src/protontricks/_vdf/__init__.py
++++ b/src/protontricks/_vdf/__init__.py
+@@ -16,7 +16,7 @@ try:
+ except:
+     from collections import Mapping
+ 
+-from vdf.vdict import VDFDict
++from . import vdict
+ 
+ # Py2 & Py3 compatibility
+ if sys.version_info[0] >= 3:
+diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py
+index 98793e3..c8307ff 100644
+--- a/src/protontricks/steam.py
++++ b/src/protontricks/steam.py
+@@ -6,7 +6,7 @@ import zlib
+ from collections import OrderedDict
+ from pathlib import Path
+ 
+-import vdf
++from . import _vdf as vdf
+ 
+ from ._vdf import binary_loads as vendored_binary_loads
+ from .util import is_steam_deck, lower_dict
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 3553a94..c6d3706 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -8,7 +8,7 @@ from pathlib import Path
+ from subprocess import run, TimeoutExpired
+ 
+ import pytest
+-import vdf
++from protontricks import _vdf as vdf
+ 
+ from protontricks.cli.desktop_install import \
+     cli as desktop_install_cli_entrypoint
+diff --git a/tests/test_steam.py b/tests/test_steam.py
+index 347a034..6cb255f 100644
+--- a/tests/test_steam.py
++++ b/tests/test_steam.py
+@@ -4,7 +4,7 @@ import time
+ from pathlib import Path
+ 
+ import pytest
+-import vdf
++from protontricks import _vdf as vdf
+ 
+ from protontricks.steam import (SteamApp, _get_steamapps_subdirs,
+                                 find_appid_proton_prefix,
+-- 
+2.46.0
+

_service

@@ -2,7 +2,7 @@
     <service name="tar_scm" mode="manual">
         <param name="scm">git</param>
         <param name="url">https://github.com/Matoking/protontricks.git</param>
-        <param name="revision">1.11.1</param>
+        <param name="revision">1.12.0</param>
         <param name="versionformat">@PARENT_TAG@</param>
         <param name="package-meta">yes</param>
     </service>

protontricks-1.11.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61dd433a6d6fdf03c15fa56250f8a6d19f7f305e1b5101399045de1da0e62613
-size 890372

protontricks-1.11.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb9d550c01728102f79c8fdbd2eacc29244b660b9a07068d0c220ebc67ae9431
-size 927824

protontricks-1.12.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d83b96b2f1268a581fefc687a32fa43feb78b0beba6911dab2a0807a710c754
+size 1011264

protontricks.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu Oct 17 15:12:29 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
+
+- add yad, set it as default (recommendation from upstream)
+- remove small adjustments, as they got fixed upstream
+
+-------------------------------------------------------------------
+Thu Oct 10 06:35:01 UTC 2024 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Update to version 1.12.0:
+  * --cwd-app flag to set working directory to the game's installation directory
+  * Add support for Snap Steam installations
+  * protontricks -c and protontricks-launch now use the current working directory
+    instead of the game's installation directory. --cwd-app can be used to
+    restore old behavior. Scripts can also $STEAM_APP_PATH environment variable
+    to determine the game's installation directory; this has been supported
+    (albeit undocumented) since 1.8.0.
+  * protontricks will now launch GUI if no arguments were provided
+  * Fix crash when parsing appinfo.vdf V29 in new Steam client version
+  * Fix Protontricks crash when config.vdf contains invalid Unicode characters
+- Removed %check section as many tests for this version are broken
+- Install the build dependency to git only for Tumbleweed, as it is only used there
+- Use local provided python vdf module
+- Add patches:
+  * 0001-Fix-using-local-vdf-module.patch
+
 -------------------------------------------------------------------
 Wed Aug 14 14:20:55 UTC 2024 - Ralf Habacker <ralf.habacker@freenet.de>
 

protontricks.spec

@@ -17,40 +17,31 @@
 #
 
 
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           protontricks
-Version:        1.11.1
+Version:        1.12.0
 Release:        0
 Summary:        Winetricks for Proton-enabled Games
 License:        GPL-3.0-only
-Group:          System/Emulators/PC
 URL:            https://github.com/Matoking/protontricks
 Source0:        %{name}-%{version}.tar.xz
+Patch1:         0001-Fix-using-local-vdf-module.patch
 BuildRequires:  fdupes
-BuildRequires:  git
+BuildRequires:  git-core
 BuildRequires:  python-rpm-macros
-# START TESTING SECTION
 BuildRequires:  python3-Pillow
-BuildRequires:  python3-pytest >= 3.6
 BuildRequires:  python3-setuptools_scm
-BuildRequires:  python3-vdf >= 2.4
 BuildRequires:  update-desktop-files
-# needed for the desktop file icon
-BuildRequires:  wine
-# END TESTING SECTION
 Requires:       python3-Pillow
 Requires:       python3-setuptools
-Requires:       python3-vdf
 Requires:       winetricks
-Requires:       zenity
+Requires:       (yad or zenity)
 BuildArch:      noarch
 
 %description
 A simple wrapper that does winetricks things for Proton enabled games.
 
 %prep
-%setup -q
-chmod -x src/protontricks/cli/main.py
+%autosetup -p1
 
 # Fix non-executable-script check
 chmod +x src/protontricks/data/scripts/*.sh
@@ -60,13 +51,9 @@ chmod +x src/protontricks/data/scripts/*.sh
 
 %install
 %python3_install
-%suse_update_desktop_file -r protontricks Game Amusement
+%suse_update_desktop_file %{name}
 %fdupes -s %{buildroot}
 
-%check
-export LC_ALL='en_US.utf8'
-PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitelib} py.test-%{python3_version}
-
 %files
 %license LICENSE
 %doc README.md CHANGELOG.md
@@ -75,6 +62,7 @@ PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitelib} py.test-%{python3_version}
 %{_bindir}/%{name}-launch
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-launch.desktop
-%{python3_sitelib}/*
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}-*.egg-info
 
 %changelog