summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bouvier2017-09-12 17:01:21 +0200
committerAlexandre Bouvier2017-09-12 17:01:21 +0200
commit526f9ec19fdaded58404a1eb59534b8eba395c57 (patch)
tree2df5ecb0d6d4d31c64cd92c9cea1e74d89eedba6
parente46851e21af865ef38458eeee2bca92d0895850a (diff)
downloadaur-526f9ec19fdaded58404a1eb59534b8eba395c57.tar.gz
fix conflicts with arc-kde in [community]
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f4139c5853b..68a264e4ec4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = arc-kde-git
- pkgver = 20170908.r15.gb33bc48
+ pkgver = 20170912.r7.g826411a
pkgrel = 1
epoch = 2
url = https://github.com/PapirusDevelopmentTeam/arc-kde
arch = any
license = GPL3
makedepends = git
- conflicts = arc-kde-git<2:
options = !strip
source = arc-kde-git::git+https://github.com/PapirusDevelopmentTeam/arc-kde.git
sha256sums = SKIP
@@ -29,14 +28,13 @@ pkgname = kvantum-theme-arc-git
pkgdesc = Arc theme for Kvantum
depends = kvantum-qt5
provides = kvantum-theme-arc
- conflicts = arc-kde-git<2:
conflicts =
+ conflicts = arc-kde-git<2:
pkgname = konsole-colorscheme-arc-git
pkgdesc = Arc theme for Konsole
depends = konsole
provides = konsole-colorscheme-arc
- conflicts = arc-kde-git<2:
conflicts =
conflicts = arc-kde<2:
@@ -44,13 +42,13 @@ pkgname = yakuake-skin-arc-git
pkgdesc = Arc theme for Yakuake
depends = yakuake
provides = yakuake-skin-arc
- conflicts = arc-kde-git<2:
conflicts =
+ conflicts = arc-kde<2:
pkgname = konversation-theme-arc-git
pkgdesc = Arc theme for Konversation
depends = konversation
provides = konversation-theme-arc
- conflicts = arc-kde-git<2:
conflicts =
+ conflicts = arc-kde-git<2:
diff --git a/PKGBUILD b/PKGBUILD
index 684ee785c7e..5b45e6362f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,13 @@ _pkgname=("${_pkgbase}"
'konversation-theme-arc')
pkgname=("${_pkgname[@]/%/-git}")
pkgbase=${_pkgbase}-git
-pkgver=20170908.r15.gb33bc48
+pkgver=20170912.r7.g826411a
pkgrel=1
epoch=2
arch=('any')
url="https://github.com/PapirusDevelopmentTeam/${_pkgbase}"
license=('GPL3')
makedepends=('git')
-conflicts=("${pkgbase}<2:")
options=('!strip')
source=("${pkgbase}::git+${url}.git")
sha256sums=('SKIP')
@@ -61,7 +60,7 @@ package_kvantum-theme-arc-git() {
pkgdesc="Arc theme for Kvantum"
depends=('kvantum-qt5')
provides=('kvantum-theme-arc')
- conflicts+=("${provides[0]}")
+ conflicts=("${provides[0]}" "${pkgbase}<2:")
_install Kvantum
}
@@ -70,7 +69,7 @@ package_konsole-colorscheme-arc-git() {
pkgdesc="Arc theme for Konsole"
depends=('konsole')
provides=('konsole-colorscheme-arc')
- conflicts+=("${provides[0]}" "${_pkgbase}<2:")
+ conflicts=("${provides[0]}" "${_pkgbase}<2:")
_install konsole
}
@@ -79,7 +78,7 @@ package_yakuake-skin-arc-git() {
pkgdesc="Arc theme for Yakuake"
depends=('yakuake')
provides=('yakuake-skin-arc')
- conflicts+=("${provides[0]}")
+ conflicts=("${provides[0]}" "${_pkgbase}<2:")
_install yakuake
}
@@ -88,7 +87,7 @@ package_konversation-theme-arc-git() {
pkgdesc="Arc theme for Konversation"
depends=('konversation')
provides=('konversation-theme-arc')
- conflicts+=("${provides[0]}")
+ conflicts=("${provides[0]}" "${pkgbase}<2:")
_install konversation
}