From a034429c68739082d9ae5b9b1a057a191f6e14ec Mon Sep 17 00:00:00 2001 From: maniacata Date: Mon, 18 Jan 2021 12:08:24 +0800 Subject: fix: files & conflicts --- .SRCINFO | 7 ++++++- PKGBUILD | 10 +++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dd5d94a..0950997 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = logisim-evolution pkgdesc = An educational tool for designing and simulating digital logic circuits (build from source) pkgver = 3.4.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/reds-heig/logisim-evolution install = logisim-evolution.install arch = any @@ -9,8 +9,13 @@ pkgbase = logisim-evolution makedepends = java-environment>=9 depends = java-runtime>=9 depends = hicolor-icon-theme + provides = logisim-evolution + conflicts = logisim-evolution-git + conflicts = logisim-evolution-bin source = logisim-evolution-3.4.1.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v3.4.1.tar.gz + source = logisim-evolution.sh sha256sums = bce8ee163e80b56a49a4ec3b5fa10c2b21779146f4c2c44d4bc7560a72566236 + sha256sums = d5975cc0025905ab8a8a451ce4362ba876bed88008d3a5b2c0a7f664a85da1ba pkgname = logisim-evolution diff --git a/PKGBUILD b/PKGBUILD index c0d8a00..6927bdb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,16 +9,20 @@ pkgname=logisim-evolution pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='An educational tool for designing and simulating digital logic circuits (build from source)' +provides=('logisim-evolution') +conflicts=('logisim-evolution-git' 'logisim-evolution-bin') arch=('any') url="https://github.com/reds-heig/logisim-evolution" license=('GPL3') depends=('java-runtime>=9' 'hicolor-icon-theme') makedepends=('java-environment>=9') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v${pkgver}.tar.gz") -sha256sums=('bce8ee163e80b56a49a4ec3b5fa10c2b21779146f4c2c44d4bc7560a72566236') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v${pkgver}.tar.gz" + "${pkgname}.sh") +sha256sums=('bce8ee163e80b56a49a4ec3b5fa10c2b21779146f4c2c44d4bc7560a72566236' + 'd5975cc0025905ab8a8a451ce4362ba876bed88008d3a5b2c0a7f664a85da1ba') install=$pkgname.install -- cgit v1.2.3-70-g09d2