summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Molnar2020-02-25 19:04:48 +0100
committerRenato Molnar2020-02-25 19:04:48 +0100
commit5d633594bfc1a40dc3ef2306307dce5bf76df25b (patch)
tree44bf9f10686f4df2cf7f02808e9fec9cb4582e98
parentdc5738ef7bc6d3e6fc77c0f1c342f792353e4b2d (diff)
downloadaur-5d633594bfc1a40dc3ef2306307dce5bf76df25b.tar.gz
Fix provides and conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04c10565c9b6..4271fd2a93b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = notepadpp
pkgdesc = A free source code editor for Windows (32-bit)
pkgver = 7.8.4
- pkgrel = 1
+ pkgrel = 2
url = https://notepad-plus-plus.org/
arch = i686
arch = x86_64
@@ -9,6 +9,9 @@ pkgbase = notepadpp
makedepends = unzip
depends = wine
depends = sh
+ provides = notepadpp
+ conflicts = notepadpp-win32
+ conflicts = notepadpp-win64
noextract = npp.7.8.4.bin.zip
noextract = npp.7.8.4.bin.x64.zip
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index af65b6b4bf82..3e2486eba4a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _type=legacy
pkgname=notepadpp
_pkgname=notepad-plus-plus
pkgver=7.8.4
-pkgrel=1
+pkgrel=2
pkgdesc="A free source code editor for Windows"
arch=('x86_64')
url="https://${_pkgname}.org/"
@@ -16,6 +16,8 @@ license=('GPL2')
arch=('i686' 'x86_64')
depends=('wine' 'sh')
makedepends=('unzip')
+provides=(notepadpp)
+conflicts=('notepadpp-win32' 'notepadpp-win64')
source=(notepadpp-legacy
notepadpp-overlayfs
notepadpp.desktop