From 8f65625836a843a4d2b6bae6ffeca429785f46da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Husi=C4=8Dka?= <contact@bydave.net>
Date: Sat, 27 Mar 2021 12:42:48 +0100
Subject: [PATCH] Fix conflict with the `osu` package
---
.SRCINFO | 4 +---
PKGBUILD | 8 ++++----
osu-lazer.desktop | 3 ++-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 7b45d41..5590984 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = osu-lazer-bin
pkgdesc = The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
pkgver = 2021.323.0
- pkgrel = 1
+ pkgrel = 2
url = https://osu.ppy.sh
arch = x86_64
license = MIT
@@ -11,9 +11,7 @@ pkgbase = osu-lazer-bin
depends = libgl
depends = sdl2
depends = fuse2
- provides = osu
provides = osu-lazer
- conflicts = osu
conflicts = osu-lazer
noextract = osu-lazer-bin-2021.323.0.AppImage
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 7025f3a..24c4321 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=osu-lazer-bin
pkgver=2021.323.0
-pkgrel=1
+pkgrel=2
pkgdesc="The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew."
arch=('x86_64')
url="https://osu.ppy.sh"
@@ -12,8 +12,8 @@ depends=(ffmpeg zlib libgl sdl2 fuse2)
makedepends=()
checkdepends=()
optdepends=()
-provides=(osu osu-lazer)
-conflicts=(osu osu-lazer)
+provides=(osu-lazer)
+conflicts=(osu-lazer)
replaces=()
backup=()
options=(!strip)
@@ -40,6 +40,6 @@ package() {
install -Dm644 osu-lazer.desktop "${pkgdir}"/usr/share/applications/osu-lazer.desktop
# Install binary
- install -Dm755 "${srcdir}"/"${pkgname}"-"${pkgver}".AppImage "${pkgdir}"/usr/bin/osu
+ install -Dm755 "${srcdir}"/"${pkgname}"-"${pkgver}".AppImage "${pkgdir}"/usr/bin/osu-lazer
}
diff --git a/osu-lazer.desktop b/osu-lazer.desktop
index ed4ada4..47b1b9f 100644
--- a/osu-lazer.desktop
+++ b/osu-lazer.desktop
@@ -3,4 +3,5 @@ Type=Application
Name=osu!lazer
Icon=/usr/share/pixmaps/osu-lazer.png
Comment=Open source free-to-win rhythm game
-Exec=/usr/bin/osu
+Exec=/usr/bin/osu-lazer
+Categories=Game;