summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIyán Méndez Veiga2019-10-16 10:48:42 +0200
committerIyán Méndez Veiga2019-10-16 10:48:42 +0200
commit81ca477d3df3313d5a8cb5e80fd56c8e8d9eeb53 (patch)
tree0432103dcfa269a0f5b42d96b3dcafe2b775ddc8
parent20dad70451c3c0a35c197cab342e7919f1db9d53 (diff)
downloadaur-81ca477d3df3313d5a8cb5e80fd56c8e8d9eeb53.tar.gz
Remove conflict and replace arrays
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 2 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c46cb28edf6f..b4435639fa35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = adwaita-qt4
pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell
pkgver = 1.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/FedoraQt/adwaita-qt
arch = x86_64
license = GPL
@@ -9,10 +9,6 @@ pkgbase = adwaita-qt4
makedepends = git
depends = qt4
optdepends = qgnomeplatform: apply GNOME settings to Qt apps
- conflicts = adwaita-qt-common
- conflicts = adwaita-qt-git
- replaces = adwaita-qt-common
- replaces = adwaita-qt-git
source = https://github.com/FedoraQt/adwaita-qt/archive/1.1.0.tar.gz
sha256sums = a7d535e42ff56a4851eeb0572b920c2e76ae0bdd87fe21a8503242fe6e7327f6
diff --git a/PKGBUILD b/PKGBUILD
index 54b38ad23d88..ba34bf2cf193 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=adwaita-qt4
_pkgname=adwaita-qt
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc='A style to bend Qt applications to look like they belong into GNOME Shell'
arch=('x86_64')
url="https://github.com/FedoraQt/adwaita-qt"
@@ -13,8 +13,6 @@ license=('GPL')
depends=('qt4')
makedepends=('cmake' 'git')
optdepends=('qgnomeplatform: apply GNOME settings to Qt apps')
-conflicts=('adwaita-qt-common' 'adwaita-qt-git')
-replaces=('adwaita-qt-common' 'adwaita-qt-git')
source=("https://github.com/FedoraQt/${_pkgname}/archive/${pkgver}.tar.gz")
sha256sums=('a7d535e42ff56a4851eeb0572b920c2e76ae0bdd87fe21a8503242fe6e7327f6')
build() {