From 69509351cff0d28cd378db84fb1480952785f65a Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 24 Apr 2025 04:03:00 -0700 Subject: [PATCH] fix(xone): Dropoff epoch and Conflicts/Obsoletes old versions (#4393) (#4403) (cherry picked from commit fe3b6c4c89caa2ccfeead57e9e3f9ee710414356) Co-authored-by: Gilver --- anda/system/xone/akmod/xone-kmod.spec | 9 ++++++++- anda/system/xone/dkms/dkms-xone.spec | 9 ++++++++- anda/system/xone/kmod-common/xone.spec | 14 ++++++++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index b102d1b539..179a5e85ee 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -8,7 +8,10 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -19,6 +22,10 @@ Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} Requires: akmods Conflicts: dkms-%{modulename} +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +%endif Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index ef3be6c570..bb087b2651 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -7,7 +7,10 @@ Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -18,6 +21,10 @@ BuildRequires: systemd-rpm-macros Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +%endif BuildArch: noarch Packager: Gilver E. diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index a42d60d041..fa154992f6 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -8,7 +8,10 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -23,13 +26,16 @@ BuildRequires: cabextract BuildRequires: sed BuildRequires: systemd-rpm-macros Requires: wireless-regdb -Requires: %{name}-firmware = %{version}-%{release} +Requires: %{name}-firmware = %{?epoch:%{epoch}:}%{version}-%{release} Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Requires(post): dracut Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}%{version}-2%{?dist} Conflicts: xow <= 0.5 Obsoletes: xow <= 0.5 +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c +%endif BuildArch: noarch Packager: Gilver E. @@ -49,7 +55,7 @@ Summary: Firmware for the XBox One controller dongle License: Proprietary Requires: wireless-regdb %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name}-firmware = %{commitdate}.%{shortcommit}-%{release} +Obsoletes: %{name}-firmware < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c %endif BuildArch: noarch