removed python-ly conflict

2 files changed, 10 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74c6bcd8be91..a0abe8f70a76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ly-git
 	pkgdesc = TUI display manager
-	pkgver = 0.5.3.r89.gc64f806
+	pkgver = 0.6.0.r4.g4ee2b3e
 	pkgrel = 1
 	url = https://github.com/fairyglade/ly
 	arch = i686
@@ -13,7 +13,6 @@ pkgbase = ly-git
 	optdepends = xorg-xauth: for X server sessions
 	provides = ly
 	conflicts = ly
-	conflicts = python-ly
 	backup = etc/ly/config.ini
 	backup = etc/ly/wsetup.sh
 	backup = etc/ly/xsetup.sh
diff --git a/PKGBUILD b/PKGBUILD
index 7624d29372af..b3a448829e73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: steffeno <steffeno dash etc at protonmail dot com>
 _pkgname=ly
 pkgname="$_pkgname"-git
-pkgver=0.5.3.r89.gc64f806
+pkgver=0.6.0.r4.g4ee2b3e
 pkgrel=1
 pkgdesc="TUI display manager"
 arch=(i686 x86_64 aarch64)
@@ -10,29 +10,29 @@ license=('custom:WTFPL')
 depends=(pam)
 makedepends=(git libxcb)
 optdepends=('xorg-xauth: for X server sessions')
-conflicts=(ly python-ly)
+conflicts=(ly)
 provides=(ly)
 backup=(etc/"$_pkgname"/{config.ini,wsetup.sh,xsetup.sh})
 source=("git+$url.git")
 md5sums=('SKIP')
 
 pkgver() {
-	cd ly
+	cd "$_pkgname"
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd ly
-  git submodule update --init --recursive
+	cd "$_pkgname"
+    git submodule update --init --recursive
 }
 
 build() {
-	cd ly
-	make
+	make -C "$_pkgname"
 }
 
 package() {
-	cd ly
-	make DESTDIR="$pkgdir" install installsystemd
+	cd "$_pkgname"
+	make DESTDIR="$pkgdir" NAME=ly-dm install installsystemd
+    sed -i "s;/usr/bin/ly;/usr/bin/ly-dm;g" "$pkgdir/usr/lib/systemd/system/ly.service"
 	install -D -m644 license.md "${pkgdir}/usr/share/licenses/${pkgname}/WTFPL"
 }