summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik “Freso” S. Olesen2017-01-06 18:51:03 +0100
committerFrederik “Freso” S. Olesen2017-01-06 18:51:03 +0100
commit1bb6105316b205366d90860efde4048f66e42e68 (patch)
tree06dd33e26dd328ca7324fc18c174705367e94773
parent91f8e92825d5ab3f18832c24b874da68e29f13dd (diff)
downloadaur-1bb6105316b205366d90860efde4048f66e42e68.tar.gz
Add `morituri` to $conflicts.
whipper is still using `morituri` for the Python library names, so there will still be conflicting files in the path.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1c5ab8bec1c..4f9d4d165f18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Dec 21 01:03:30 UTC 2016
pkgbase = whipper-git
pkgdesc = A Unix CD ripper aiming for accuracy over speed -- forked from morituri
- pkgver = 0.4.0.r16.gd1ed80d
+ pkgver = 0.4.0.r22.ga1eb337
pkgrel = 1
url = https://github.com/JoeLametta/whipper
arch = any
@@ -24,6 +22,7 @@ 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 ffa26891f6ca..6ca76c014614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
# Based on community/morituri and aur/morituri-git PKGBUILDs
pkgname=whipper-git
-pkgver=0.4.0.r16.gd1ed80d
+pkgver=0.4.0.r22.ga1eb337
pkgrel=1
pkgdesc="A Unix CD ripper aiming for accuracy over speed -- forked from morituri"
arch=('any')
@@ -34,7 +34,7 @@ makedepends=(
'python2-gobject2'
)
provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+conflicts=("${pkgname%-git}" 'morituri')
source=("git+${url}.git")
md5sums=('SKIP')