summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik “Freso” S. Olesen2017-04-27 23:22:00 +0200
committerFrederik “Freso” S. Olesen2017-04-27 23:22:00 +0200
commitbba2d0e1990c1aa568b1a90e325688164a99dfd3 (patch)
treeaa477e6be942f648ca26fcf9f14f0cdfef0de8cf
parent1cf5a50078babc66520f7bf34936db4bbd407e1e (diff)
downloadaur-bba2d0e1990c1aa568b1a90e325688164a99dfd3.tar.gz
Remove "morituri" from $conflicts
whipper's Python module has been renamed from "morituri" to "whipper" as per https://github.com/JoeLametta/whipper/pull/109 / https://github.com/JoeLametta/whipper/commit/fc3cdbfebf34cb9db6766b6ce41393d0f80bb595
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6fc51becd8b7..943ad2bf2487 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = whipper-git
pkgdesc = A Unix CD ripper aiming for accuracy over speed -- forked from morituri
- pkgver = 0.5.1.r0.g17b70ce
- pkgrel = 2
+ pkgver = 0.5.1.r9.gfc3cdbf
+ pkgrel = 1
url = https://github.com/JoeLametta/whipper
arch = any
license = GPL3
@@ -20,7 +20,6 @@ pkgbase = whipper-git
depends = sox
provides = whipper
conflicts = whipper
- conflicts = morituri
source = git+https://github.com/JoeLametta/whipper.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e2723dadcdbc..f80d2b80e2ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
# Based on community/morituri and aur/morituri-git PKGBUILDs
pkgname=whipper-git
-pkgver=0.5.1.r0.g17b70ce
-pkgrel=2
+pkgver=0.5.1.r9.gfc3cdbf
+pkgrel=1
pkgdesc="A Unix CD ripper aiming for accuracy over speed -- forked from morituri"
arch=('any')
url="https://github.com/JoeLametta/whipper"
@@ -34,7 +34,7 @@ checkdepends=(
'python2-twisted'
)
provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}" 'morituri')
+conflicts=("${pkgname%-git}")
source=("git+${url}.git")
md5sums=('SKIP')