summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro López-Valencia2019-01-30 12:39:30 -0500
committerAlejandro López-Valencia2019-01-30 12:39:30 -0500
commit7148a71a594d555809c38fffac7214e6ae317f52 (patch)
treefbed811725e10ce2221a22cc9ec7473947ee7353
parent45212fc182afd12881fe8520da2d43da297d251d (diff)
downloadaur-7148a71a594d555809c38fffac7214e6ae317f52.tar.gz
Add the proper conflicts/replaces/provides to boot emacs-seq out as
it is provided by emacs 27 itself. Tip by Rogach.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD10
2 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b317e42e710..63fd1e946c6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development.
- pkgver = 27.0.50.134300
- pkgrel = 2
+ pkgver = 27.0.50.135188
+ pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = x86_64
license = GPL3
@@ -15,8 +15,11 @@ pkgbase = emacs-git
depends = libjpeg-turbo
depends = giflib
provides = emacs
+ provides = emacs-seq
conflicts = emacs
- replaces = emacs
+ conflicts = emacs-seq
+ replaces = emacs26-git
+ replaces = emacs-seq
source = emacs-git::git+https://github.com/emacs-mirror/emacs.git#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e29b4c269c4d..0675c71b5a29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,8 +72,8 @@ if [[ $BRANCH = "emacs-26" ]]; then
else
pkgname=emacs-git
fi
-pkgver=27.0.50.134300
-pkgrel=2
+pkgver=27.0.50.135188
+pkgrel=1
pkgdesc="GNU Emacs. Development."
arch=('x86_64') # Arch Linux only. Users of derivatives are on their own.
url="http://www.gnu.org/software/emacs/"
@@ -149,9 +149,9 @@ fi
#######################################################################
#######################################################################
-provides=('emacs')
-conflicts=('emacs')
-replaces=('emacs26-git')
+provides=('emacs' 'emacs-seq')
+conflicts=('emacs' 'emacs-seq')
+replaces=('emacs26-git' 'emacs-seq')
source=("emacs-git::git+https://github.com/emacs-mirror/emacs.git#branch=$BRANCH")
md5sums=('SKIP')
# If Github access is blocked for reasons, use Savannah's servers instead.