summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e51560875824..aa1923d68ca8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,12 +11,8 @@ pkgbase = mozilla-extension-gnome-keyring-git
provides = firefox-gnome-keyring
provides = thunderbird-gnome-keyring
provides = mozilla-extension-gnome-keyring=0.11
- conflicts = firefox-gnome-keyring
conflicts = firefox-gnome-keyring-git
- conflicts = firefox-gnome-keyring-bin
- conflicts = thunderbird-gnome-keyring
conflicts = thunderbird-gnome-keyring-git
- conflicts = thunderbird-gnome-keyring-bin
conflicts = mozilla-extension-gnome-keyring
source = mozilla-extension-gnome-keyring::git+https://github.com/swick/moz-gnome-keyring-integration
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 59d01edbc5b4..a33092e6d530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ license=(GPLv3)
depends=(libgnome-keyring)
optdepends=(firefox thunderbird)
provides=({firefox,thunderbird}-gnome-keyring)
-conflicts=({firefox,thunderbird}-gnome-keyring{,-git,-bin})
+conflicts=({firefox,thunderbird}-gnome-keyring-git)
makedepends+=('git')
source+=("${_gitname:=${pkgname%-git}}::${_giturl:-git+$url}")