summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD29
2 files changed, 23 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6312d969b57c..2da61d5e21d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
pkgbase = freedoom-git
pkgdesc = Free game data files for Doom gaming engines
- pkgver = 0.11.r318.g68647ba9
+ pkgver = 0.14.0.alpha.r45.g8c335ccd
pkgrel = 1
epoch = 1
url = http://freedoom.github.io/
arch = any
license = BSD
- makedepends = git
- makedepends = python-pillow
- makedepends = deutex-git
- makedepends = python
- makedepends = python-virtualenv
makedepends = asciidoc
+ makedepends = deutex
+ makedepends = python
+ makedepends = python-pillow
+ makedepends = git
+ depends = bash
source = git+https://github.com/freedoom/freedoom.git
sha256sums = SKIP
@@ -19,11 +19,10 @@ pkgname = freedm-git
provides = freedoom
provides = freedm
-pkgname = freedoom1-git
- provides = freedoom
+pkgname = freedoom-git
provides = freedoom1
-
-pkgname = freedoom2-git
- provides = freedoom
provides = freedoom2
-
+ conflicts = freedoom1
+ conflicts = freedoom2
+ replaces = freedoom1
+ replaces = freedoom2
diff --git a/PKGBUILD b/PKGBUILD
index 0f14000848d3..18f884adfcfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,19 @@
# Contributor: Christoph Zeiler <rabyte*gmail>
# Contributor: felix <at yandex.com, m.p.isaev>
-pkgname=({freedm,freedoom1,freedoom2}-git)
+pkgname=({freedm,freedoom}-git)
pkgbase=freedoom-git
pkgdesc="Free game data files for Doom gaming engines"
-pkgver=0.11.r318.g68647ba9
+pkgver=0.14.0.alpha.r45.g8c335ccd
pkgrel=1
epoch=1
arch=('any')
url="http://freedoom.github.io/"
license=('BSD')
-makedepends=('git' 'python-pillow' 'deutex-git' 'python' 'python-virtualenv' 'asciidoc')
+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"
@@ -30,22 +31,16 @@ package_freedm-git() {
provides=('freedoom' 'freedm')
cd "$srcdir/freedoom"
- make DESTDIR="$pkgdir" prefix=/usr install-freedm
- install -Dm644 COPYING.adoc "$pkgdir"/usr/share/licenses/freedm/COPYING
+ make prefix=/usr DESTDIR="$pkgdir" install-freedm
+ install -Dm644 $srcdir/freedoom/COPYING.adoc $pkgdir/usr/share/licenses/$pkgname/COPYING
}
-package_freedoom1-git() {
- provides=('freedoom' 'freedoom1')
+package_freedoom-git() {
+ replaces=('freedoom1' 'freedoom2')
+ conflicts=('freedoom1' 'freedoom2')
+ provides=('freedoom1' 'freedoom2')
cd "$srcdir/freedoom"
- make DESTDIR="$pkgdir" prefix=/usr install-freedoom1
- install -Dm644 COPYING.adoc "$pkgdir"/usr/share/licenses/freedoom1/COPYING
+ make prefix=/usr DESTDIR="$pkgdir" install-freedoom
}
-package_freedoom2-git() {
- provides=('freedoom' 'freedoom2')
-
- cd "$srcdir/freedoom"
- make DESTDIR="$pkgdir" prefix=/usr install-freedoom2
- install -Dm644 COPYING.adoc "$pkgdir"/usr/share/licenses/freedoom2/COPYING
-}