summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYigit Dallilar2020-07-02 23:03:40 +0200
committerYigit Dallilar2020-07-02 23:03:40 +0200
commit72076eed47e25cedfde98bbfd5e5ea2708a87dc0 (patch)
treee0ca1bc295146b174e120d329f952841d4ea55da
parente21f0f39472b8d67a92b4a45a4b32815ad143562 (diff)
downloadaur-72076eed47e25cedfde98bbfd5e5ea2708a87dc0.tar.gz
replaces/conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08644d3531bd..8c151c032fd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
pkgbase = ms-office-online
pkgdesc = Microsoft Office Suite Online as a native application
pkgver = 20.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.office.com/
arch = any
license = GPL3
license = CC
depends = jade-application-kit>=3.0.0
- conflicts = ms-office-online
- replaces = ms-office-online
source = https://gitlab.manjaro.org/applications/ms-office-online-launcher/-/archive/f0be4ad4886df7a8c346efcfca82337e5e97e835/ms-office-online-launcher-f0be4ad4886df7a8c346efcfca82337e5e97e835.tar.gz
sha256sums = 4bcea8753c296148f605519e4c3d3fd0362d24cc02dbb581db288abe805e75b6
diff --git a/PKGBUILD b/PKGBUILD
index b3fe9267b908..f8c72e335e30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=('ms-office-online')
pkgver=20.1.0
-pkgrel=1
+pkgrel=2
#epoch=1
_commit=f0be4ad4886df7a8c346efcfca82337e5e97e835
pkgdesc="Microsoft Office Suite Online as a native application"
@@ -12,8 +12,8 @@ url="https://www.office.com/"
depends=('jade-application-kit>=3.0.0')
license=('GPL3' 'CC')
arch=('any')
-replaces=('ms-office-online')
-conflicts=('ms-office-online')
+#replaces=('ms-office-online')
+#conflicts=('ms-office-online')
source=("https://gitlab.manjaro.org/applications/ms-office-online-launcher/-/archive/$_commit/ms-office-online-launcher-$_commit.tar.gz")
sha256sums=('4bcea8753c296148f605519e4c3d3fd0362d24cc02dbb581db288abe805e75b6')