summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2021-11-22 14:46:10 -0500
committerPedro A. López-Valencia2021-11-22 14:46:10 -0500
commit63936aad9b7bbb4e364d3b3f1051806c6476a341 (patch)
treea9337c87a826b291c5c4b10cf96e135df213a17f
parente9198eeda18785494a33fa7b8d0406340354e3f7 (diff)
downloadaur-63936aad9b7bbb4e364d3b3f1051806c6476a341.tar.gz
* Add conflicts for emacs28-git.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD10
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9b93a834eb1..147f69b06d51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development master branch.
- pkgver = 29.0.50.152009
- pkgrel = 2
+ pkgver = 29.0.50.152013
+ pkgrel = 1
url = http://www.gnu.org/software/emacs/
install = emacs-git.install
arch = x86_64
@@ -23,16 +23,19 @@ pkgbase = emacs-git
provides = emacs
provides = emacs26-git
provides = emacs-27-git
+ provides = emacs28-git
provides = emacs-seq
provides = emacs-nox
conflicts = emacs
conflicts = emacs26-git
conflicts = emacs-27-git
+ conflicts = emacs28-git
conflicts = emacs-seq
conflicts = emacs-nox
replaces = emacs
replaces = emacs26-git
replaces = emacs-27-git
+ replaces = emacs28-git
replaces = emacs-seq
replaces = emacs-nox
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 4ec7a25f349a..965f125f2d05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,8 +73,8 @@ if [[ $CLI == "YES" ]] ; then
else
pkgname="emacs-git"
fi
-pkgver=29.0.50.152009
-pkgrel=2
+pkgver=29.0.50.152013
+pkgrel=1
pkgdesc="GNU Emacs. Development master branch."
arch=('x86_64')
url="http://www.gnu.org/software/emacs/"
@@ -82,9 +82,9 @@ license=('GPL3')
depends_nox=('alsa-lib' 'gnutls' 'libxml2' 'jansson' 'gpm')
depends=("${depends_nox[@]}" 'm17n-lib' 'libotf' 'harfbuzz')
makedepends=('git')
-provides=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs-seq' 'emacs-nox')
-conflicts=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs-seq' 'emacs-nox')
-replaces=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs-seq' 'emacs-nox')
+provides=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox')
+conflicts=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox')
+replaces=('emacs' 'emacs26-git' 'emacs-27-git' 'emacs28-git' 'emacs-seq' 'emacs-nox')
#source=("emacs-git::git://git.savannah.gnu.org/emacs.git")
# If Savannah fails for reasons, use Github's mirror
source=("emacs-git::git://github.com/emacs-mirror/emacs.git")