From 09b27edbd4184b7f8f2a842c51dce3ff0a240361 Mon Sep 17 00:00:00 2001
From: dimstar <>
Date: Apr 15 2021 15:15:49 +0000
Subject: Update adwaita-qt to version 1.2.1 / rev 8 via SR 885673


https://build.opensuse.org/request/show/885673
by user dimstar + dimstar_suse
- Fix SLPP package name:
  + Rename libadwaitaqt1_2_1 to  libadwaitaqt1: the libraries have
    a sover of '1'.
  + Obsolete the previously wrongly named  libadwaitaqt1_2_0 (
    libadwaitaqt1_2_1 was never shipped in a product).

- Update to 1.2.1
  * Fixes for Adwaita library
  * Define ADWAITAQT_LIBRARIES variable
  * Define ADWAITAQT_INCLUDE_DIRS variable

---

diff --git a/.rev b/.rev
index 4ba749a..ec1da60 100644
--- a/.rev
+++ b/.rev
@@ -69,4 +69,24 @@
     <comment></comment>
     <requestid>862962</requestid>
   </revision>
+<<<<<<< Updated upstream
+=======
+  <revision rev="8" vrev="1">
+    <srcmd5>1d011410815f52b6fe111e69e38445be</srcmd5>
+    <version>1.2.1</version>
+    <time>1618498689</time>
+    <user>dimstar_suse</user>
+    <comment>- Fix SLPP package name:
+  + Rename libadwaitaqt1_2_1 to  libadwaitaqt1: the libraries have
+    a sover of '1'.
+  + Obsolete the previously wrongly named  libadwaitaqt1_2_0 (
+    libadwaitaqt1_2_1 was never shipped in a product).
+
+- Update to 1.2.1
+  * Fixes for Adwaita library
+  * Define ADWAITAQT_LIBRARIES variable
+  * Define ADWAITAQT_INCLUDE_DIRS variable</comment>
+    <requestid>885673</requestid>
+  </revision>
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/adwaita-qt-1.2.1.tar.gz b/adwaita-qt-1.2.1.tar.gz
new file mode 120000
index 0000000..8360000
--- /dev/null
+++ b/adwaita-qt-1.2.1.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiclqpb2mn2ennzh53xmt4ur75awgffkeu74ufgxgecyjw5cnnleey
\ No newline at end of file
diff --git a/adwaita-qt.changes b/adwaita-qt.changes
index 3287f7a..e4d4bd0 100644
--- a/adwaita-qt.changes
+++ b/adwaita-qt.changes
@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Thu Apr 15 13:36:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix SLPP package name:
+  + Rename libadwaitaqt1_2_1 to  libadwaitaqt1: the libraries have
+    a sover of '1'.
+  + Obsolete the previously wrongly named  libadwaitaqt1_2_0 (
+    libadwaitaqt1_2_1 was never shipped in a product).
+
+-------------------------------------------------------------------
+Tue Apr 13 19:48:34 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 1.2.1
+  * Fixes for Adwaita library
+  * Define ADWAITAQT_LIBRARIES variable
+  * Define ADWAITAQT_INCLUDE_DIRS variable
+
+-------------------------------------------------------------------
+>>>>>>> Stashed changes
 Tue Jan  5 21:14:33 UTC 2021 - Matthias Eliasson <elimat@opensuse.org>
 
 - Update to 1.2.0
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index fb8ff87..f8c05f3 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -17,9 +17,15 @@
 #
 
 
+<<<<<<< Updated upstream
 %define sover 1_2_0
 Name:           adwaita-qt
 Version:        1.2.0
+=======
+%define sover 1
+Name:           adwaita-qt
+Version:        1.2.1
+>>>>>>> Stashed changes
 Release:        0
 Summary:        Adwaita theme for Qt-based applications
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -27,7 +33,11 @@ URL:            https://github.com/FedoraQt/adwaita-qt
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  fdupes
+<<<<<<< Updated upstream
 BuildRequires:  libqt5-qtbase-devel
+=======
+BuildRequires:  libqt5-qtbase-devel >= 5.12
+>>>>>>> Stashed changes
 BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libxcb-devel
 Requires:       adwaita-qt5
@@ -46,6 +56,13 @@ Adwaita theme variant for applications utilizing Qt5
 
 %package -n libadwaitaqt%{sover}
 Summary:        Adwaita Qt5 library
+<<<<<<< Updated upstream
+=======
+# The package was wwronlgy called  libadwaitaqt1_2_0 in the past
+# As long as we are at .so.1, we can obsolete this old, wrong
+# package name
+Obsoletes:      libadwaitaqt1_2_0
+>>>>>>> Stashed changes
 
 %description -n libadwaitaqt%{sover}
 Adwaita theme variant for applications utilizing Qt5