summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhoton892017-12-30 16:59:22 +0100
committerPhoton892017-12-30 16:59:22 +0100
commit63b818c0fdfe1fb71825c59ac92120dc7a3b2f36 (patch)
tree3705d668122f2e8891775cd5d5e0e8f924ba9cc9
parent1e551906039a24e62d466ebfa9881d34601180a5 (diff)
downloadaur-63b818c0fdfe1fb71825c59ac92120dc7a3b2f36.tar.gz
Split off conflicting locale files to extra package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD9
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 81a9c88ee1d4..dca563473f9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xfce4-multiload-ng-plugin-gtk3
pkgdesc = Modern graphical system monitor, XFCE4 panel plugin
pkgver = 1.5.2
- pkgrel = 1
+ pkgrel = 3
url = https://udda.github.io/multiload-ng/
arch = i686
arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = xfce4-multiload-ng-plugin-gtk3
depends = cairo
depends = libxfce4util>=4.12.0
depends = xfce4-panel>=4.12.0
+ depends = multiload-ng-common
conflicts = xfce4-multiload-ng-plugin-gtk2
conflicts = xfce4-multiload-ng-plugin-gtk2-git
conflicts = xfce4-multiload-ng-plugin-gtk3-git
diff --git a/PKGBUILD b/PKGBUILD
index d9695bef1e6a..956220b055e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Mario Cianciolo <mr.udda at gmail dot com>
-# Co-maintainer: Michael Kogan <michael.kogan at gmx dot net>
+# Maintainer: Michael Kogan <michael.kogan at gmx dot net>
+# Co-maintainer: Mario Cianciolo <mr.udda at gmail dot com>
# This file is automatically generated from multiload-ng source.
pkgname='xfce4-multiload-ng-plugin-gtk3'
pkgdesc='Modern graphical system monitor, XFCE4 panel plugin'
pkgver=1.5.2
-pkgrel=1
+pkgrel=3
makedepends=('intltool')
-depends=('gtk3' 'cairo' 'libxfce4util>=4.12.0' 'xfce4-panel>=4.12.0')
+depends=('gtk3' 'cairo' 'libxfce4util>=4.12.0' 'xfce4-panel>=4.12.0' 'multiload-ng-common')
conflicts=('xfce4-multiload-ng-plugin-gtk2' 'xfce4-multiload-ng-plugin-gtk2-git' 'xfce4-multiload-ng-plugin-gtk3-git')
@@ -30,4 +30,5 @@ build() {
package() {
cd "multiload-ng-$pkgver"
make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/locale"
}