summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Choina2021-02-02 15:06:38 -0500
committerSolomon Choina2021-02-02 15:06:38 -0500
commit97619feb489103d18614bbb29bcafc7156d22849 (patch)
tree8cb3260f965dc417aff33bf27bbb56b21bfd9f71
parent5093f567ca241646262d079552480dbc1a89146b (diff)
downloadaur-97619feb489103d18614bbb29bcafc7156d22849.tar.gz
conflicts?
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9475264f567d..f11581c6bc03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,7 +5,6 @@ pkgbase = glib2-selinux
url = https://wiki.gnome.org/Projects/GLib
arch = x86_64
license = LGPL
- checkdepends = desktop-file-utils
makedepends = gettext
makedepends = gtk-doc
makedepends = shared-mime-info
@@ -45,9 +44,10 @@ pkgname = glib2-selinux
provides = libgmodule-2.0.so
provides = libgobject-2.0.so
provides = libgthread-2.0.so
+ conflicts = glib2
pkgname = glib2-selinux-docs
pkgdesc = Documentation for GLib
license = LGPL
license = custom
- depends =
+ conflicts = glib2-docs
diff --git a/PKGBUILD b/PKGBUILD
index 469fcbb6e34e..82e84eedd690 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,6 @@ arch=(x86_64)
depends=(pcre libffi util-linux-libs zlib)
makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux
meson dbus sysprof)
-checkdepends=(desktop-file-utils)
_commit=bacbec652d356895ec493f3de2f2f6f4c7dafde0 # tags/2.66.4^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
noisy-glib-compile-schemas.diff
@@ -49,6 +48,7 @@ package_glib2-selinux() {
depends+=(libmount.so)
provides+=(libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
libgthread-2.0.so)
+ conflicts=('glib2')
optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
'libelf: gresource inspection tool'
'selinux: selinux support')
@@ -74,7 +74,7 @@ package_glib2-selinux() {
package_glib2-selinux-docs() {
pkgdesc="Documentation for GLib"
- depends=()
+ conflicts=(glib2-docs)
license+=(custom)
mv -t "$pkgdir" docs/*