diff --git a/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch b/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch deleted file mode 100644 index db79472..0000000 --- a/0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 356ec23ba0d96855d9a33bc1abd51977b336e962 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -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 - diff --git a/0002-Revert-Bump-version.patch b/0002-Revert-Bump-version.patch deleted file mode 100644 index 5e13e17..0000000 --- a/0002-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From dc64876fb0392eb654369718747f8cc55ceea775 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -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 - diff --git a/_service b/_service index 28acc85..0d25864 100644 --- a/_service +++ b/_service @@ -1,12 +1,11 @@ - enable - 5.15.2+kde@TAG_OFFSET@ + 5.15.10 https://invent.kde.org/qt/qt/qtscript.git git qtscript-everywhere-src - kde/5.15 - v5.15.2 + 5.15.10 + v5.15.10-lts enable diff --git a/_servicedata b/_servicedata index fc9d3b5..51525cd 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/qt/qt/qtscript.git - 5cec94b2c1503f106f4ef4778d016410ebb86211 \ No newline at end of file + be545189e9fb7e67ff064560ca885d250b932a0d \ No newline at end of file diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 8c55efe..ba7026f 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 27 13:21:00 UTC 2022 - Fabian Vogt + +- Update to version 5.15.10: + * Bump version to 5.15.10 + * Blacklist two tests that fail on macOS ARM + * Bump version from 5.15.8 to 5.15.9 + * Bump version from 5.15.7 to 5.15.8 + * Bump version from 5.15.6 to 5.15.7 + * Bump version from 5.15.5 to 5.15.6 + * Bump version from 5.15.4 to 5.15.5 +- Drop patches, it's versioned correctly now: + * 0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch + * 0002-Revert-Bump-version.patch + ------------------------------------------------------------------- Tue Jun 22 19:40:05 UTC 2021 - Fabian Vogt diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index fc57cac..5300aa5 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 1 %define libname libQt5Script5 %define base_name libqt5 -%define real_version 5.15.2 -%define so_version 5.15.2 +%define real_version 5.15.10 +%define so_version 5.15.10 %define tar_version qtscript-everywhere-src-%{version} Name: libqt5-qtscript -Version: 5.15.2+kde4 +Version: 5.15.10 Release: 0 Summary: Qt 5 Script library # Legal: @@ -34,22 +34,19 @@ Group: Development/Libraries/X11 URL: https://www.qt.io 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 Patch3: libqt5-qtscript-s390-support.patch -BuildRequires: libQt5Core-private-headers-devel >= %{real_version} -BuildRequires: libQt5Widgets-private-headers-devel >= %{real_version} +BuildRequires: libQt5Core-private-headers-devel >= 5.15 +BuildRequires: libQt5Widgets-private-headers-devel >= 5.15 %if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif BuildRequires: pkgconfig BuildRequires: xz -BuildRequires: pkgconfig(Qt5DBus) >= %{real_version} -BuildRequires: pkgconfig(Qt5Gui) >= %{real_version} -BuildRequires: pkgconfig(Qt5Widgets) >= %{real_version} +BuildRequires: pkgconfig(Qt5DBus) >= 5.15 +BuildRequires: pkgconfig(Qt5Gui) >= 5.15 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.15 %description Qt Script is a module for adding scripting to applications. It allows @@ -86,8 +83,8 @@ applications that want to make use of libQt5Script5. 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 >= %{real_version} -Requires: libQt5Widgets-private-headers-devel >= %{real_version} +%requires_eq libQt5Core-private-headers-devel +%requires_eq libQt5Widgets-private-headers-devel Provides: libQt5Script-private-headers-devel = %{version} Obsoletes: libQt5Script-private-headers-devel < %{version} BuildArch: noarch diff --git a/qtscript-everywhere-src-5.15.10.obscpio b/qtscript-everywhere-src-5.15.10.obscpio new file mode 100644 index 0000000..dc2612b --- /dev/null +++ b/qtscript-everywhere-src-5.15.10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:592d6e444cc4ee2f76ff955a8120505922ad345f1e6c7ba12e7c9d5ac454c545 +size 25933837 diff --git a/qtscript-everywhere-src-5.15.2+kde4.obscpio b/qtscript-everywhere-src-5.15.2+kde4.obscpio deleted file mode 100644 index 64c816d..0000000 --- a/qtscript-everywhere-src-5.15.2+kde4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b89e918ad3066cd228d19274f6a0f2a8689ba7c7d7ff44effad3d19462472357 -size 25936910 diff --git a/qtscript-everywhere-src.obsinfo b/qtscript-everywhere-src.obsinfo index 2b93d92..5ec1973 100644 --- a/qtscript-everywhere-src.obsinfo +++ b/qtscript-everywhere-src.obsinfo @@ -1,5 +1,4 @@ name: qtscript-everywhere-src -version: 5.15.2+kde4 -mtime: 1615904441 -commit: 5cec94b2c1503f106f4ef4778d016410ebb86211 - +version: 5.15.10 +mtime: 1649312820 +commit: be545189e9fb7e67ff064560ca885d250b932a0d