21 Commits

Author SHA1 Message Date
7b9a5096c4 Fix rpm dependencies on suse 2021-12-03 18:36:12 -05:00
44791794e9 Fix rpm dependencies on suse 2021-12-03 18:35:13 -05:00
3265e06542 Fix rpm dependencies on suse 2021-12-03 18:34:43 -05:00
f903018b91 Fix rpm dependencies on suse 2021-12-03 18:31:08 -05:00
a0685bf08f Fix rpm dependencies on suse 2021-12-03 18:29:15 -05:00
c00d3b2dea Fix rpm dependencies on suse 2021-12-03 18:27:05 -05:00
34516685f0 Fix rpm dependencies on suse 2021-12-03 18:25:45 -05:00
c789076c84 Fix rpm dependencies on suse 2021-12-03 18:22:34 -05:00
4b75d0315c Fix rpm dependencies on suse 2021-12-03 18:21:01 -05:00
4db064c619 Fix rpm dependencies on suse 2021-12-03 18:19:29 -05:00
daa5a463a7 Fix rpm dependencies on suse 2021-12-03 18:17:25 -05:00
58e11aa803 Fix rpm dependencies on suse 2021-12-03 18:15:31 -05:00
18680d8d9f Fix rpm dependencies on suse 2021-12-03 18:14:30 -05:00
ce325a4aff Fix rpm dependencies on suse 2021-12-03 18:08:58 -05:00
ac7309b04b Fix rpm dependencies on suse 2021-12-03 18:05:33 -05:00
8597f0a407 Fix rpm dependencies on suse 2021-12-03 18:04:18 -05:00
e4bee0f89b Fix rpm dependencies on suse 2021-12-03 18:02:49 -05:00
19730dd3bb Fix rpm dependencies on suse 2021-12-03 18:00:04 -05:00
8ff9bacb0b Fix rpm dependencies on suse 2021-12-03 17:55:50 -05:00
08891917c1 Fix rpm dependencies on suse 2021-12-03 17:52:03 -05:00
b46cf3c56a Improve SUSE uninstall 2021-12-03 17:49:20 -05:00

View File

@@ -139,7 +139,7 @@ init() {
echo "SUSE support is experimental!"
pkg_install(){ ifSudo zypper --non-interactive -q install --force --no-confirm "$@"; }
pkg_remove(){ ifSudo zypper --non-interactive -q remove --clean-deps "$@"; }
pkg_update(){ ifSudo zypper --non-interactive -q refresh; }
pkg_update(){ ifSudo zypper --non-interactive -q refresh jriver; }
pkg_query(){ ifSudo rpm -q "$@"; }
firewall_cmd(){ ifSudo firewall-cmd "$@"; }
fi
@@ -609,9 +609,9 @@ buildRPM() {
# If you are building on SUSE, I assume you want SUSE RPMs
# i.e. cross-building not an option but could be added
if [[ "$ID" =~ ^opensuse.*$ ]]; then
_requires=$'Requires: Mesa-libVulkan-devel\n'
_requires=$'Requires: Mesa-libVulkan-devel\nRequires: freetype >= 1.3.1\nRequires: libharfbuzz0 >= 2.3.1\nRequires: libX11-6 >= 1.6\nRequires: libX11-data >= 1.6\nRequires: libXdmcp6 >= 1.1\nRequires: libXext6 >= 1.3\nRequires: libepoxy0 >= 1.5.3\nRequires: libgomp1 >= 7.4\nRequires: libstdc++6 >= 7.4\nRequires: libuuid1 >= 2.33\nRequires: libva2 >= 2.4.0\nRequires: libxcb1 >= 1.1\nRequires: libgbm1 >= 18.3.6\nRequires: mozilla-nspr >= 4.20\nRequires: mozilla-nss >= 3.42'
else
_requires=$'Requires: mesa-vulkan-drivers\n'
_requires=$'Requires: mesa-vulkan-drivers\nRequires: freetype >= 2.9.1\nRequires: harfbuzz >= 2.3.1\nRequires: libX11 >= 1.6\nRequires: libX11-common >= 1.6\nRequires: libXdmcp >= 1.1\nRequires: libXext >= 1.3\nRequires: libepoxy >= 1.5.3\nRequires: libgomp >= 7.4\nRequires: libstdc++ >= 7.4\nRequires: libuuid >= 2.33\nRequires: libva >= 2.4.0\nRequires: libxcb >= 1.1\nRequires: mesa-libgbm >= 18.3.6\nRequires: nspr >= 4.20\nRequires: nss >= 3.42'
fi
debug "Requires: $_requires"
@@ -631,30 +631,14 @@ buildRPM() {
AutoReq: 0
Requires: glibc >= 2.28
Requires: alsa-lib >= 1.1.8
Requires: libuuid >= 2.33
Requires: libX11 >= 1.6
Requires: libX11-common >= 1.6
Requires: libXext >= 1.3
Requires: libxcb >= 1.1
Requires: libXdmcp >= 1.1
Requires: libstdc++ >= 7.4
Requires: gtk3 >= 3.24
Requires: pango >= 1.42
Requires: nss >= 3.42
Requires: nspr >= 4.20
Requires: python3
Requires: xdg-utils
Requires: libgomp >= 7.4
Requires: fribidi >= 1.0.5
Requires: fontconfig >= 2.13
Requires: freetype >= 2.9.1
Requires: harfbuzz >= 2.3.1
Requires: mesa-libgbm >= 18.3.6
Requires: libva >= 2.4.0
Requires: libepoxy >= 1.5.3
Requires: lcms2 >= 2.9
Requires: vulkan-headers >= 1.1
Requires: mesa-vulkan-drivers
Requires: ca-certificates
Requires: libXScrnSaver
${_requires:-}
@@ -1234,6 +1218,9 @@ uninstall() {
&& rm_cmd "/etc/yum.repos.d/jriver.repo"
[[ -f "/etc/apt/sources.list.d/jriver.list" ]] \
&& rm_cmd "/etc/apt/sources.list.d/jriver.list"
if [[ "$ID" =~ ^opensuse.* ]]; then
ifSudo zypper rr jriver > /dev/null 2>&1
fi
debug "Removing firewall rules"
if [[ -x $(command -v firewall-cmd) ]]; then