Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtscript for openSUSE:Factory
checked in at 2021-06-27 18:58:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtscript (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtscript.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscript"
Sun Jun 27 18:58:50 2021 rev:49 rq:902329 version:5.15.2+kde4
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtscript/libqt5-qtscript.changes
2020-11-25 19:29:30.874502586 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtscript.new.2625/libqt5-qtscript.changes
2021-06-27 18:59:37.132318383 +0200
@@ -1,0 +2,13 @@
+Tue Jun 22 19:40:05 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Switch to KDE's maintenance branch
+- Update to version 5.15.2+kde4:
+ * Bump version from 5.15.3 to 5.15.4
+ * Add product_dependencies.yaml to build against LTS 5.15
+ * Add changes file for Qt 5.15.2
+ * Bump version
+- Add patches to reset version to 5.15.2:
+ * 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+ * 0002-Revert-Bump-version.patch
+
+-------------------------------------------------------------------
Old:
----
qtscript-everywhere-src-5.15.2.tar.xz
New:
----
0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
0002-Revert-Bump-version.patch
_service
_servicedata
qtscript-everywhere-src-5.15.2+kde4.obscpio
qtscript-everywhere-src.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtscript.spec ++++++
--- /var/tmp/diff_new_pack.9Sr5dt/_old 2021-06-27 18:59:38.416320071 +0200
+++ /var/tmp/diff_new_pack.9Sr5dt/_new 2021-06-27 18:59:38.420320076 +0200
@@ -16,14 +16,14 @@
#
-%define qt5_snapshot 0
+%define qt5_snapshot 1
%define libname libQt5Script5
%define base_name libqt5
%define real_version 5.15.2
%define so_version 5.15.2
-%define tar_version qtscript-everywhere-src-5.15.2
+%define tar_version qtscript-everywhere-src-%{version}
Name: libqt5-qtscript
-Version: 5.15.2
+Version: 5.15.2+kde4
Release: 0
Summary: Qt 5 Script library
# Legal:
@@ -32,21 +32,24 @@
License: (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later) AND
LGPL-2.0-or-later AND LGPL-2.1-only
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
Source1: baselibs.conf
+# PATCH-FIX-OPENSUSE
+Patch1: 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+Patch2: 0002-Revert-Bump-version.patch
# PATCH-FIX-UPSTREAM libqt5-qtscript-s390-support.patch -- adds s390, taken
from webkit upstream
-Patch1: libqt5-qtscript-s390-support.patch
-BuildRequires: libQt5Core-private-headers-devel >= %{version}
-BuildRequires: libQt5Widgets-private-headers-devel >= %{version}
+Patch3: libqt5-qtscript-s390-support.patch
+BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
+BuildRequires: libQt5Widgets-private-headers-devel >= %{real_version}
%if %{qt5_snapshot}
#to create the forwarding headers
BuildRequires: perl
%endif
BuildRequires: pkgconfig
BuildRequires: xz
-BuildRequires: pkgconfig(Qt5DBus) >= %{version}
-BuildRequires: pkgconfig(Qt5Gui) >= %{version}
-BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
+BuildRequires: pkgconfig(Qt5DBus) >= %{real_version}
+BuildRequires: pkgconfig(Qt5Gui) >= %{real_version}
+BuildRequires: pkgconfig(Qt5Widgets) >= %{real_version}
%description
Qt Script is a module for adding scripting to applications. It allows
@@ -83,8 +86,8 @@
Summary: Non-ABI stable experimental API for the Qt5 Script library
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
-Requires: libQt5Core-private-headers-devel >= %{version}
-Requires: libQt5Widgets-private-headers-devel >= %{version}
+Requires: libQt5Core-private-headers-devel >= %{real_version}
+Requires: libQt5Widgets-private-headers-devel >= %{real_version}
Provides: libQt5Script-private-headers-devel = %{version}
Obsoletes: libQt5Script-private-headers-devel < %{version}
BuildArch: noarch
++++++ 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch ++++++
>From 356ec23ba0d96855d9a33bc1abd51977b336e962 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Tue, 22 Jun 2021 21:40:05 +0200
Subject: [PATCH 1/2] Revert "Bump version from 5.15.3 to 5.15.4"
This reverts commit 5cec94b2c1503f106f4ef4778d016410ebb86211.
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index 0a9b5a9..0057b81 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.4
+MODULE_VERSION = 5.15.3
--
2.20.1
++++++ 0002-Revert-Bump-version.patch ++++++
>From dc64876fb0392eb654369718747f8cc55ceea775 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Wed, 23 Jun 2021 08:28:13 +0200
Subject: [PATCH 2/2] Revert "Bump version"
This reverts commit f5b1ab0afd5e7ca61e8ea6fbb6f1f273599dd608.
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index 0057b81..032763c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-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/qtscript.git</param>
<param name="scm">git</param>
<param name="filename">qtscript-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/qtscript.git</param>
<param
name="changesrevision">5cec94b2c1503f106f4ef4778d016410ebb86211</param></service></servicedata>++++++
qtscript-everywhere-src.obsinfo ++++++
name: qtscript-everywhere-src
version: 5.15.2+kde4
mtime: 1615904441
commit: 5cec94b2c1503f106f4ef4778d016410ebb86211
