Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libqt5-qtquickcontrols2 for 
openSUSE:Factory checked in at 2021-06-27 18:58:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols2 (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols2.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtquickcontrols2"

Sun Jun 27 18:58:58 2021 rev:23 rq:902350 version:5.15.2+kde7

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/libqt5-qtquickcontrols2/libqt5-qtquickcontrols2.changes
  2021-01-26 14:44:09.555200383 +0100
+++ 
/work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols2.new.2625/libqt5-qtquickcontrols2.changes
        2021-06-27 18:59:57.652345341 +0200
@@ -1,0 +2,15 @@
+Tue Jun 22 09:51:48 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Switch to KDE's maintenance branch
+- Update to version 5.15.2+kde7:
+  * QmlDesigner: Remove duplicate of repeat
+  * Doc: remove all instances of \qmlpropertygroup
+  * Doc: fix Qt Labs Platform Menu icon documentation
+  * Fix QQuickHeaderView models to pass model tester
+  * Doc: fix SplitView's inheritance
+  * Add changes file for Qt 5.15.2
+  * Bump version
+- Add patch to reset version to 5.15.2:
+  * 0001-Revert-Bump-version.patch
+
+-------------------------------------------------------------------

Old:
----
  qtquickcontrols2-everywhere-src-5.15.2.tar.xz

New:
----
  0001-Revert-Bump-version.patch
  _service
  _servicedata
  qtquickcontrols2-everywhere-src-5.15.2+kde7.obscpio
  qtquickcontrols2-everywhere-src.obsinfo

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtquickcontrols2.spec ++++++
--- /var/tmp/diff_new_pack.fvimT5/_old  2021-06-27 18:59:58.316346213 +0200
+++ /var/tmp/diff_new_pack.fvimT5/_new  2021-06-27 18:59:58.320346218 +0200
@@ -19,32 +19,34 @@
 # Internal QML imports of examples
 %global __requires_exclude qmlimport\\((Backend|Theme|.*example).*
 
-%define qt5_snapshot 0
+%define qt5_snapshot 1
 %define base_name libqt5
 %define real_version 5.15.2
 %define so_version 5.15.2
-%define tar_version qtquickcontrols2-everywhere-src-5.15.2
+%define tar_version qtquickcontrols2-everywhere-src-%{version}
 Name:           libqt5-qtquickcontrols2
-Version:        5.15.2
+Version:        5.15.2+kde7
 Release:        0
 Summary:        Qt 5 Quick Controls Addon
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
 Group:          Development/Libraries/X11
 URL:            https://www.qt.io
-Source:         
https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
+Source:         %{tar_version}.tar.xz
+# PATCH-FIX-OPENSUSE
+Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  fdupes
-BuildRequires:  libQt5Core-private-headers-devel >= %{version}
-BuildRequires:  libQt5Gui-private-headers-devel >= %{version}
-BuildRequires:  libqt5-qtbase-devel >= %{version}
-BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
+BuildRequires:  libQt5Core-private-headers-devel >= %{real_version}
+BuildRequires:  libQt5Gui-private-headers-devel >= %{real_version}
+BuildRequires:  libqt5-qtbase-devel >= %{real_version}
+BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{real_version}
 %if %{qt5_snapshot}
 #to create the forwarding headers
 BuildRequires:  perl
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  xz
-BuildRequires:  pkgconfig(Qt5Qml) >= %{version}
-BuildRequires:  pkgconfig(Qt5Quick) >= %{version}
+BuildRequires:  pkgconfig(Qt5Qml) >= %{real_version}
+BuildRequires:  pkgconfig(Qt5Quick) >= %{real_version}
 %requires_ge    libQt5Widgets5
 %requires_ge    libQtQuick5
 

++++++ 0001-Revert-Bump-version.patch ++++++
>From 81ce716dd6e3834781b54214eeb1634add0aa38d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fv...@suse.de>
Date: Tue, 22 Jun 2021 11:51:48 +0200
Subject: [PATCH] Revert "Bump version"

This reverts commit 2e32d0975eb058c2076597c03b07c67b7ce9027f.
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 25b262d67..4d40e4272 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS 
QT_NO_LINKED_LIST
 
 QQC2_SOURCE_TREE = $$PWD
 
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
-- 
2.20.1

++++++ _service ++++++
<services>
  <service name="obs_scm" mode="disabled">
   <param name="changesgenerate">enable</param>
   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
   <param name="url">https://invent.kde.org/qt/qt/qtquickcontrols2.git</param>
   <param name="scm">git</param>
   <param name="filename">qtquickcontrols2-everywhere-src</param>
   <param name="revision">kde/5.15</param>
   <param name="parent-tag">v5.15.2</param>
   <param name="changesgenerate">enable</param>
  </service>
  <service name="set_version" mode="disabled"/>
  <service name="tar" mode="buildtime"/>
  <service name="recompress" mode="buildtime">
   <param name="file">*.tar</param>
   <param name="compression">xz</param>
  </service>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
                <param 
name="url">https://invent.kde.org/qt/qt/qtquickcontrols2.git</param>
              <param 
name="changesrevision">a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3</param></service></servicedata>++++++
 qtquickcontrols2-everywhere-src.obsinfo ++++++
name: qtquickcontrols2-everywhere-src
version: 5.15.2+kde7
mtime: 1605025660
commit: a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3

Reply via email to