summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2022-07-03 12:45:03 +0000
committerPedro A. López-Valencia2022-07-03 12:45:03 +0000
commit79623b5cd607ed0a5f8382964174ddce9ccfe5b8 (patch)
treefabf4122d0dadbcb65ba3ba023f1e376a7301b48
parent8abb67c1022416296b7f0af94e3aa2e503245efc (diff)
downloadaur-79623b5cd607ed0a5f8382964174ddce9ccfe5b8.tar.gz
* Fix conflicts.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9d9d389d7db..af4668f5e0ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-pretest
pkgdesc = The extensible, customizable, self-documenting real-time display editor -- pretest version.
pkgver = 28.1
- pkgrel = 0.901
+ pkgrel = 0.902
url = http://www.gnu.org/software/emacs/emacs.html
arch = x86_64
license = GPL3
@@ -11,7 +11,7 @@ pkgbase = emacs-pretest
depends = giflib
depends = libgccjit
provides = emacs
- conflicts = emacs
+ conflicts = emacs-nox
source = https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.1.90.tar.xz
source = nemacs
source = readme_or_weep.txt
diff --git a/PKGBUILD b/PKGBUILD
index fcf1cbc5ec05..4fbe9f02575b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=emacs-pretest
_pkgname=emacs
pkgver=28.1
_pkgver=28.1.90
-pkgrel=0.901
+pkgrel=0.902
pkgdesc="The extensible, customizable, self-documenting real-time display editor -- pretest version."
arch=('x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
@@ -20,7 +20,7 @@ depends=(
'libgccjit'
)
provides=('emacs')
-conflicts=('emacs')
+conflicts=('emacs-nox')
# PGP keyservers are all but dead. PGP signatures are useless for all practical purpose. Kudos to the EU.
#source=(https://alpha.gnu.org/gnu/emacs/pretest/$_pkgname-$_pkgver.tar.xz{,.sig}) # PGP keyserver are all but dead.
#validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910')