Update to 1.2.0

2 files changed, 7 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ae40888c034..53e2faa78f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = adwaita-qt
 	pkgdesc = A style to bend Qt applications to look like they belong into GNOME Shell
-	pkgver = 1.1.4
-	pkgrel = 2
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://github.com/FedoraQt/adwaita-qt
 	arch = x86_64
 	license = GPL
@@ -9,9 +9,8 @@ pkgbase = adwaita-qt
 	makedepends = git
 	depends = qt5-base
 	optdepends = qgnomeplatform: apply GNOME settings to Qt apps
-	conflicts = adwaita-qt5
-	source = https://github.com/FedoraQt/adwaita-qt/archive/1.1.4.tar.gz
-	sha256sums = 350d71379adb1690aa710f23a6656b9100e04201c235e62e0e88874260420421
+	source = https://github.com/FedoraQt/adwaita-qt/archive/1.2.0.tar.gz
+	sha256sums = 5698025e1fe3479397516e504c20943611afe040c89dca6531c309fd4198cc6b
 
 pkgname = adwaita-qt
 
diff --git a/PKGBUILD b/PKGBUILD
index 64edf8695587..963e9790a161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Martin Briza <m (at) rtinbriza (dot) cz>
 
 pkgname=adwaita-qt
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 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"
@@ -12,9 +12,8 @@ license=('GPL')
 depends=('qt5-base')
 makedepends=('cmake' 'git')
 optdepends=('qgnomeplatform: apply GNOME settings to Qt apps')
-conflicts=('adwaita-qt5')
 source=("https://github.com/FedoraQt/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('350d71379adb1690aa710f23a6656b9100e04201c235e62e0e88874260420421')
+sha256sums=('5698025e1fe3479397516e504c20943611afe040c89dca6531c309fd4198cc6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"