From 796238c70eae22feb4f1d229ee096c4f1ae1ba14 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 2 Aug 2024 02:06:15 -0700 Subject: [PATCH] fix: update OpenTabletDriver to .NET 8 (#1816) (#1818) * fix: update OpenTabletDriver to .NET 8 * create a temp dir for doing stuff (cherry picked from commit 3ca853a449bc47cf022d2d0eac0d16899fc758b8) Co-authored-by: Cappy Ishihara --- anda/system/opentabletdriver/opentabletdriver.spec | 12 +++++++++--- anda/system/opentabletdriver/update.rhai | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/anda/system/opentabletdriver/opentabletdriver.spec b/anda/system/opentabletdriver/opentabletdriver.spec index c4e5dea8b5..07068f1bff 100644 --- a/anda/system/opentabletdriver/opentabletdriver.spec +++ b/anda/system/opentabletdriver/opentabletdriver.spec @@ -5,6 +5,7 @@ # We aren't using Mono but RPM expected Mono %global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$ %global __os_install_post %{nil} +%global dotnet_runtime_version 8.0 Name: opentabletdriver Version: 0.6.4.0 @@ -12,14 +13,15 @@ Release: 1%{?dist} Summary: A cross-platform open source tablet driver License: LGPLv3 URL: https://github.com/OpenTabletDriver/OpenTabletDriver +Packager: Cappy Ishihara %define otddir OpenTabletDriver-%{version} -BuildRequires: dotnet-sdk-6.0 git jq systemd-rpm-macros +BuildRequires: dotnet-sdk-%{dotnet_runtime_version} +BuildRequires: git jq systemd-rpm-macros -Requires: dotnet-runtime-6.0 +Requires: dotnet-runtime-%{dotnet_runtime_version} Requires: libevdev.so.2()(64bit) Requires: gtk3 -Requires: gtk3 Requires: udev Suggests: libX11 Suggests: libXrandr @@ -28,12 +30,16 @@ Suggests: libXrandr OpenTabletDriver is an open source, cross platform, user mode tablet driver. The goal of OpenTabletDriver is to be cross platform as possible with the highest compatibility in an easily configurable graphical user interface. %prep +mkdir -p %{otddir} +cd %{otddir} git clone -b v%version %url . %build +cd %{otddir} ./eng/linux/package.sh --output bin %install +cd %{otddir} export DONT_STRIP=1 PREFIX="%{_prefix}" ./eng/linux/package.sh --package Generic --build false mkdir -p "%{buildroot}" diff --git a/anda/system/opentabletdriver/update.rhai b/anda/system/opentabletdriver/update.rhai index 2fffd35bb4..e63c83c787 100644 --- a/anda/system/opentabletdriver/update.rhai +++ b/anda/system/opentabletdriver/update.rhai @@ -1 +1,3 @@ -rpm.version(gh("OpenTabletDriver/OpenTabletDriver")); \ No newline at end of file +# todo: Check latest .NET runtime version from Fedora repos and set macros accordingly + +rpm.version(gh("OpenTabletDriver/OpenTabletDriver"));