summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2099dfe875e3..2da61d5e21d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freedoom-git
pkgdesc = Free game data files for Doom gaming engines
- pkgver = 0.12.0.r161.g060aa049
+ pkgver = 0.14.0.alpha.r45.g8c335ccd
pkgrel = 1
epoch = 1
url = http://freedoom.github.io/
@@ -20,6 +20,9 @@ pkgname = freedm-git
provides = freedm
pkgname = freedoom-git
- provides = freedoom
provides = freedoom1
provides = freedoom2
+ conflicts = freedoom1
+ conflicts = freedoom2
+ replaces = freedoom1
+ replaces = freedoom2
diff --git a/PKGBUILD b/PKGBUILD
index 9f5977b68536..18f884adfcfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=({freedm,freedoom}-git)
pkgbase=freedoom-git
pkgdesc="Free game data files for Doom gaming engines"
-pkgver=0.12.0.r161.g060aa049
+pkgver=0.14.0.alpha.r45.g8c335ccd
pkgrel=1
epoch=1
arch=('any')
@@ -15,7 +15,7 @@ license=('BSD')
depends=('bash')
makedepends=('asciidoc' 'deutex' 'python' 'python-pillow' 'git')
source=(git+https://github.com/freedoom/freedoom.git)
-sha256sums=(SKIP)
+sha256sums=('SKIP')
pkgver() {
cd "$srcdir/freedoom"
@@ -36,10 +36,11 @@ package_freedm-git() {
}
package_freedoom-git() {
- provides=('freedoom' 'freedoom1' 'freedoom2')
+ replaces=('freedoom1' 'freedoom2')
+ conflicts=('freedoom1' 'freedoom2')
+ provides=('freedoom1' 'freedoom2')
cd "$srcdir/freedoom"
make prefix=/usr DESTDIR="$pkgdir" install-freedoom
- install -Dm644 $srcdir/freedoom/COPYING.adoc $pkgdir/usr/share/licenses/$pkgname/COPYING
}