update to 2.1.2

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 815f20806c19..26fbe6cef5fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
-pkgbase = ms-office-online
+pkgbase = microsoft-office-web-jak
 	pkgdesc = Microsoft Office Suite Online as a native application
-	pkgver = 2.1.1
+	pkgver = 2.1.2
 	pkgrel = 1
-	epoch = 2
+	epoch = 1
 	url = https://www.office.com/
 	arch = any
 	license = GPL3
 	license = CC
-	depends = jade-application-kit>=3.0.0
-	source = https://gitlab.manjaro.org/applications/ms-office-online-launcher/-/archive/8c3875783544528a1efe303a55cb24b9b9c22045/ms-office-online-launcher-8c3875783544528a1efe303a55cb24b9b9c22045.tar.gz
-	sha256sums = 3f54bd7798b56c8b052c4f0100a12cad9a5d65469b95bba107cb2a8122efa792
-
-pkgname = ms-office-online
+	depends = python-jade-application-kit>=3.0.0
+	conflicts = microsoft-office-online-jak
+	replaces = microsoft-office-online-jak
+	source = https://gitlab.manjaro.org/applications/ms-office-online-launcher/-/archive/ce29c6bfc3cb200e185b55a24a2e4f37f04fbd03/ms-office-online-launcher-ce29c6bfc3cb200e185b55a24a2e4f37f04fbd03.tar.gz
+	sha256sums = 625be65dc252e76d12e5812f9ec3b44cfeff74e7b5c2b39bf12de949a68a59c7
 
+pkgname = microsoft-office-web-jak
diff --git a/PKGBUILD b/PKGBUILD
index f2c4969e3185..b35e43ff8544 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,29 @@
-# Maintainer: Yigit Dallilar <yigit.dallilar@gmail.com>
+# Maintainer: AlieZ <aaliezz840@gmail.com>
 # Retrieved from
 # https://gitlab.manjaro.org/packages/community/microsoft-office-online-jak.git
 
-pkgname=('ms-office-online')
-pkgver=2.1.1
+pkgname=('microsoft-office-web-jak')
+pkgver=2.1.2
 pkgrel=1
-epoch=2
-_commit=8c3875783544528a1efe303a55cb24b9b9c22045
+epoch=1
+_commit=ce29c6bfc3cb200e185b55a24a2e4f37f04fbd03
 pkgdesc="Microsoft Office Suite Online as a native application"
 url="https://www.office.com/"
-depends=('jade-application-kit>=3.0.0')
+depends=('python-jade-application-kit>=3.0.0')
 license=('GPL3' 'CC')
 arch=('any')
-#replaces=('ms-office-online')
-#conflicts=('ms-office-online')
+replaces=('microsoft-office-online-jak')
+conflicts=('microsoft-office-online-jak')
 source=("https://gitlab.manjaro.org/applications/ms-office-online-launcher/-/archive/$_commit/ms-office-online-launcher-$_commit.tar.gz")
-sha256sums=('3f54bd7798b56c8b052c4f0100a12cad9a5d65469b95bba107cb2a8122efa792')
+sha256sums=('625be65dc252e76d12e5812f9ec3b44cfeff74e7b5c2b39bf12de949a68a59c7')
 
 prepare() {
     mv "ms-office-online-launcher-$_commit" "ms-office-online-launcher-$pkgver" 
 }
 
 package() {
-    cd "ms-office-online-launcher-${pkgver}"
-    mkdir -p $pkgdir/usr/bin
-    mkdir -p $pkgdir/usr/share/{applications,pixmaps}
-    cp launcher.desktop $pkgdir/usr/share/applications/ms-office-online.desktop
-    cp icons/office.png $pkgdir/usr/share/pixmaps/ms-office.png
-    cp ms-office-online $pkgdir/usr/bin
-    chmod a+x $pkgdir/usr/bin/ms-office-online
+    cd "ms-office-online-launcher-$pkgver"
+    install -Dm644 launcher.desktop "$pkgdir/usr/share/applications/ms-office-online.desktop"
+    install -Dm644 icons/office.png "$pkgdir/usr/share/pixmaps/ms-office.png"
+    install -Dm755 ms-office-online -t "$pkgdir/usr/bin/"
 }