summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsl1pkn072015-11-27 20:23:40 +0100
committersl1pkn072015-11-27 20:23:40 +0100
commitb9756195aa4b604e867772a443e082b785d7ec43 (patch)
tree05cb46b14100911e8b041d181ebfcb16be24b9dc
parenta9f403fe2bd2c250f0ffacd3425c92dff4a2b21f (diff)
downloadaur-b9756195aa4b604e867772a443e082b785d7ec43.tar.gz
Remove liblsmash.so on conflicts=()
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54ba2aa7a617..d76dd237b2af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = l-smash-git
pkgdesc = MP4 muxer and other tools. (GIT Version)
- pkgver = v2.3.0.147.gad4d50a
+ pkgver = v2.9.1.22.g3408947
pkgrel = 1
url = http://l-smash.github.io/l-smash
arch = i686
@@ -11,7 +11,6 @@ pkgbase = l-smash-git
provides = l-smash
provides = liblsmash.so
conflicts = l-smash
- conflicts = liblsmash.so
source = git+https://github.com/l-smash/l-smash.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b463519b1f47..0c8875ebccc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
pkgname=l-smash-git
-pkgver=v2.3.0.147.gad4d50a
+pkgver=v2.9.1.22.g3408947
pkgrel=1
pkgdesc="MP4 muxer and other tools. (GIT Version)"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ license=('custom:l-smash')
depends=('glibc')
makedepends=('git')
provides=('l-smash' 'liblsmash.so')
-conflicts=('l-smash' 'liblsmash.so')
+conflicts=('l-smash')
source=('git+https://github.com/l-smash/l-smash.git')
sha1sums=('SKIP')