summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mattern2016-07-11 00:28:54 +0200
committerPeter Mattern2016-07-11 00:28:54 +0200
commit906386c4c11147b9b40f6e7394db44004812a798 (patch)
tree6610552e2eed839282714743c2de98226741686c
parent3d1cb68dc21d6b34c9d55f39bebbb22828d19b9b (diff)
downloadaur-906386c4c11147b9b40f6e7394db44004812a798.tar.gz
Conflict with PCManFM-Qt ≤ 0.10.0
which was still including the library itself
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bcaa35174f5f..730caf635da3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Dec 14 22:36:35 UTC 2015
+# Sun Jul 10 22:28:40 UTC 2016
pkgbase = libfm-qt-git
pkgdesc = Qt port of libfm, a library providing components to build desktop file managers
- pkgver = r301.f0f38ac
+ pkgver = 0.11.0.13.g4aa2bb6
pkgrel = 1
url = https://github.com/lxde/libfm-qt
arch = i686
@@ -14,6 +14,7 @@ pkgbase = libfm-qt-git
depends = libfm>=1.2.0
provides = libfm-qt
conflicts = libfm-qt
+ conflicts = pcmanfm-qt<=0.10.0
source = git+https://github.com/lxde/libfm-qt.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c113393d4b60..4ca681f231ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=libfm-qt
pkgname=$_pkgname-git
-pkgver=r301.f0f38ac
+pkgver=0.11.0.13.g4aa2bb6
pkgrel=1
pkgdesc='Qt port of libfm, a library providing components to build desktop file managers'
arch=('i686' 'x86_64')
@@ -11,13 +11,13 @@ license=('LGPL')
depends=('qt5-x11extras' 'libfm>=1.2.0')
makedepends=('cmake' 'qt5-tools')
provides=("$_pkgname")
-conflicts=("$_pkgname")
+conflicts=("$_pkgname" 'pcmanfm-qt<=0.10.0')
source=('git+https://github.com/lxde/libfm-qt.git')
sha256sums=("SKIP")
pkgver() {
cd $_pkgname
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ git describe --always | sed 's:-:.:g'
}
build() {