summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlad Wenter2019-01-10 18:13:23 +0100
committerAlad Wenter2019-01-10 18:13:23 +0100
commitac4adb26f28f163efa90a5a55b825eb2c9578f15 (patch)
treeb240688a20abff50a7b5f67778621ef8549112f0
parenta82b6cc40fa7f189aef7af82a120e5bc68c6002a (diff)
downloadaur-ac4adb26f28f163efa90a5a55b825eb2c9578f15.tar.gz
add provides/conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3e0e77955426..04f472d7d60f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-gtk2
pkgdesc = The extensible, customizable, self-documenting real-time display editor
pkgver = 26.1
- pkgrel = 2
+ pkgrel = 3
url = http://www.gnu.org/software/emacs/emacs.html
arch = x86_64
license = GPL3
@@ -17,6 +17,8 @@ pkgbase = emacs-gtk2
depends = alsa-lib
depends = libmagick6
depends = gnutls
+ provides = emacs
+ conflicts = emacs
source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.1.tar.xz
source = ftp://ftp.gnu.org/gnu/emacs/emacs-26.1.tar.xz.sig
source = 0001-Ignore-color-fonts-when-using-Xft.patch
diff --git a/PKGBUILD b/PKGBUILD
index cfee40e94806..bcd0c986cc5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,15 @@
pkgname=emacs-gtk2
_pkgname=emacs
pkgver=26.1
-pkgrel=2
+pkgrel=3
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL3')
depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2'
'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls')
+conflicts=('emacs')
+provides=('emacs')
validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910')
source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig}
0001-Ignore-color-fonts-when-using-Xft.patch