funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Make WINE dep on the compat package (#4923)

Browse Source 
* feat: Make WINE dep on the compat package

* refactor(update.rhai): For now this is what I got

---------

Signed-off-by: Gilver <rockgrub@disroot.org>
This commit is contained in:
Gilver
2025-05-21 11:41:33 -05:00
committed by GitHub
parent d1b7660b23
commit 3a4078ed58
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/system/wine/dev/wine-dev.spec
+2 -1
View File
@@ -19,7 +19,7 @@
# Also less confusing because it has a devel package
Name: wine-dev
Version: %(echo %{cleanver} | sed 's/-/~/g')
Release: 1%?dist
Release: 2%?dist
Epoch: 1
Summary: WINE Is Not An Emulator - runs MS Windows programs
License: LGPL-2.0-or-later
@@ -143,6 +143,7 @@ Conflicts: %{name}64
%if 0%{?fedora} < 40
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%endif
Requires: %{compat_package} = %{epoch}:%{version}-%{release}
Provides: %{lib_name} = %{epoch}:%{version}-%{release}
Provides: %{name}-bin = %{epoch}:%{version}-%{release}
Obsoletes: %{lib_name} <= %{epoch}:%{version}-%{release}
anda/system/wine/stable/update.rhai
+8 -6
View File
@@ -1,6 +1,8 @@
let matches = (find_all("[\\d.]+[.]0", get("https://dl.winehq.org/wine/source/"))); // Only find versions ending in .0. Stable WINE always ends in .0
matches.dedup();
// Sort for the largest match, the sed and tr commands remove everything preventing sort from working correctly
let v = sh(`echo ${matches} | sed 's/,//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/"//g' | tr ' ' '\n' | sort -nr | tr '\n' ' '`, #{"stdout": "piped"}).ctx.stdout;
v.truncate(4);
rpm.version(v);
let v = [];
// Only find versions ending in .0. Stable WINE always ends in .0
for matches in find_all("[\\d.]+\\.0", get("https://dl.winehq.org/wine/source/")) {
v += matches[0].parse_float();
}
v.dedup();
v.sort();
rpm.version(v[v.len()-1]);
anda/system/wine/stable/wine-stable.spec
+2 -1
View File
@@ -12,7 +12,7 @@
Name: wine-stable
Version: 10.0
Release: 1
Release: 2%{?dist}
Epoch: 1
Summary: WINE Is Not An Emulator - runs MS Windows programs
License: LGPL-2.0-or-later
@@ -136,6 +136,7 @@ Conflicts: %{name}64
%if 0%{?fedora} < 40
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%endif
Requires: %{compat_package} = %{epoch}:%{version}-%{release}
Provides: %{lib_name} = %{epoch}:%{version}-%{release}
Provides: %{name}-bin = %{epoch}:%{version}-%{release}
Obsoletes: %{lib_name} <= %{epoch}:%{version}-%{release}
anda/system/wine/staging/update.rhai
+3 -3
View File
@@ -3,10 +3,10 @@ v.crop(1);
rpm.version(v);
if rpm.changed () {
rpm.release();
// Only find versions ending in .x (point releases)
let matches = (find_all("[\\d.]+[.]x", get("https://dl.winehq.org/wine/source/")));
// Only find versions ending in .x (point releases). Staging is always point releases.
let matches = (find_all("[\\d.]+\\.x", get("https://dl.winehq.org/wine/source/")));
matches.dedup();
let s = sh(`echo ${matches} | sed 's/,//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/"//g' | tr ' ' '\n' | sort -nr | tr '\n' ' '`, #{"stdout": "piped"}).ctx.stdout;
let s = sh(`echo ${matches} | sed 's/,//g;s/\[//g;s/\]//g;s/"//g' | tr ' ' '\n' | sort -nr | tr '\n' ' '`, #{"stdout": "piped"}).ctx.stdout;
s.truncate(4);
rpm.global("srcmajor", s);
}
anda/system/wine/staging/wine-staging.spec
+2 -1
View File
@@ -19,7 +19,7 @@
Name: wine-staging
Version: 10.8
Release: 1%?dist
Release: 2%?dist
Epoch: 1
Summary: WINE Is Not An Emulator - runs MS Windows programs
License: LGPL-2.0-or-later
@@ -148,6 +148,7 @@ Conflicts: %{name}64
%if 0%{?fedora} < 40
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%endif
Requires: %{compat_package} = %{epoch}:%{version}-%{release}
Provides: %{lib_name} = %{epoch}:%{version}-%{release}
Obsoletes: %{lib_name} <= %{epoch}:%{version}-%{release}
Provides: %{name}-bin = %{epoch}:%{version}-%{release}