summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7052ac3064f2..3e9b428caa6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = network-manager-applet-gtk2-jlindgren90-git
pkgdesc = GNOME frontends to NetWorkmanager for gtk2 ported by jlindgren90
pkgver = 1.8.2.r4117.20180819
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jlindgren90/network-manager-applet-gtk2
install = network-manager-applet.install
arch = i686
@@ -20,6 +20,8 @@ pkgbase = network-manager-applet-gtk2-jlindgren90-git
conflicts = network-manager-applet
conflicts = network-manager-applet-gtk2
conflicts = nm-connection-editor
+ conflicts = libnm-gtk
+ conflicts = libnma
options = !emptydirs
source = network-manager-applet-gtk2-jlindgren90-git::git+https://github.com/jlindgren90/network-manager-applet-gtk2.git
source = network-manager-applet.install
diff --git a/PKGBUILD b/PKGBUILD
index d151803aa12a..355925c7e2b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=network-manager-applet-gtk2-jlindgren90-git
_pkgname=network-manager-applet
pkgver=1.8.2.r4117.20180819
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME frontends to NetWorkmanager for gtk2 ported by jlindgren90"
arch=(i686 x86_64)
license=(GPL)
@@ -27,7 +27,7 @@ makedepends=(intltool
)
options=('!emptydirs')
provides=($_pkgname=$pkgver)
-conflicts=($_pkgname $_pkgname-gtk2 nm-connection-editor)
+conflicts=($_pkgname $_pkgname-gtk2 nm-connection-editor libnm-gtk libnma)
install=network-manager-applet.install
source=(
$pkgname::git+https://github.com/jlindgren90/network-manager-applet-gtk2.git