diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch new file mode 100644 index 0000000..af14353 --- /dev/null +++ b/0001-Revert-Bump-version.patch @@ -0,0 +1,23 @@ +From 8a2e60a7486d7f31c487efb7a0108743ed54c6fb Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 22 Jun 2021 21:35:06 +0200 +Subject: [PATCH] Revert "Bump version" + +This reverts commit dbe0567470db2b369a9fdb28d9fbac38be3e2d60. +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 05561703..6ec606e7 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -2,4 +2,4 @@ load(qt_build_config) + + DEFINES += 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 new file mode 100644 index 0000000..de38049 --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + enable + 5.15.2+kde@TAG_OFFSET@ + https://invent.kde.org/qt/qt/qttools.git + git + qttools-everywhere-src + kde/5.15 + v5.15.2 + enable + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..72c293a --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/qt/qt/qttools.git + 33693a928986006d79c1ee743733cde5966ac402 \ No newline at end of file diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 33403b8..fc2184b 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Jun 22 19:35:06 UTC 2021 - Fabian Vogt + +- Switch to KDE's maintenance branch +- Update to version 5.15.2+kde17: + * Clamp registered collection time-stamp to SOURCE_DATE_EPOCH if set + * CMake: Fix handling of -extensions argument + * Add changes file for Qt 5.12.10 + * Fix qdbusviewer.exe missing version and copyright information + * qdoc: Avoid excess warnings for undocumented namespaces + * qdoc: Skip ignored entries in .qhp + * qdoc: DocBook generator: Fix \headerfile generation + * Replace prefined application name by a generic name + * Doc: Document attribution argument + * qdoc: Handle JSON as plain text + * CMake: Fix usage of qt_create_translation in a CTest + * Clear out deprecated QLocale::Language values + * qt5_create_translation: Fix handling of directory dependencies + * Add changes file for Qt 5.15.2 + * qdoc: Avoid duplicates in \sincelist + * qtpaths: Add missing location types + * Bump version +- Add patch to reset version to 5.15.2: + * 0001-Revert-Bump-version.patch + ------------------------------------------------------------------- Fri Nov 20 12:09:40 UTC 2020 - Fabian Vogt diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 1f4e08a..9b113c2 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -16,11 +16,11 @@ # -%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 qttools-everywhere-src-5.15.2 +%define tar_version qttools-everywhere-src-%{version} %if 0%{?suse_version} >= 1330 %bcond_without qdoc %else @@ -28,7 +28,7 @@ %bcond_with qdoc %endif Name: libqt5-qttools -Version: 5.15.2 +Version: 5.15.2+kde17 Release: 0 Summary: Qt 5 QtTools Module # Legal: @@ -40,20 +40,22 @@ Summary: Qt 5 QtTools Module License: (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)) AND GPL-3.0-only WITH Qt-GPL-exception-1.0 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 Source11: designer5.desktop Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop Source99: libqt5-qttools-rpmlintrc +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Bump-version.patch %if %{with qdoc} BuildRequires: clang-devel >= 3.9.0 %endif BuildRequires: fdupes -BuildRequires: libqt5-qtbase-devel >= %{version} -BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} -BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildRequires: libqt5-qtbase-devel >= %{real_version} +BuildRequires: libqt5-qtbase-private-headers-devel >= %{real_version} +BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version} BuildRequires: libxslt-devel %if %{qt5_snapshot} #to create the forwarding headers @@ -63,7 +65,7 @@ BuildRequires: update-desktop-files BuildRequires: xz Requires: %{name}-qhelpgenerator = %{version} # help files are SQLite databases, so assistant/qhelpgenerator need the SQLite plugin -Requires: libQt5Sql5-sqlite >= %{version} +Requires: libQt5Sql5-sqlite >= %{real_version} Requires: libqt5-qdbus = %{version} Requires: libqt5-qtpaths = %{version} %requires_ge libQt5DBus5 @@ -88,7 +90,7 @@ Requires: libQt5DesignerComponents5 = %{version} Requires: libQt5Help5 = %{version} Requires: libqt5-linguist-devel = %{version} Requires: libxslt-devel -Requires: pkgconfig(Qt5Xml) >= %{so_version} +Requires: pkgconfig(Qt5Xml) >= %{real_version} Recommends: %{name} = %{version} Recommends: %{name}-doc = %{version} @@ -158,7 +160,7 @@ The Qt 5 Help library. Summary: Generator for Qt5 Help files (qch) Group: Development/Libraries/X11 # help files are SQLite databases, so assistant/qhelpgenerator need the SQLite plugin -Requires: libQt5Sql5-sqlite >= %{version} +Requires: libQt5Sql5-sqlite >= %{real_version} %description qhelpgenerator Binaries for generating .qch help catalogs. @@ -178,7 +180,7 @@ The Qt 5 Linguist Tools. Summary: Development files for the Qt 5 Linguist tools Group: Development/Libraries/X11 Requires: libqt5-linguist = %{version} -Requires: pkgconfig(Qt5Core) >= %{version} +Requires: pkgconfig(Qt5Core) >= %{real_version} %description -n libqt5-linguist-devel The Qt 5 Linguist Tools - development files. diff --git a/qttools-everywhere-src-5.15.2+kde17.obscpio b/qttools-everywhere-src-5.15.2+kde17.obscpio new file mode 100644 index 0000000..34071b8 --- /dev/null +++ b/qttools-everywhere-src-5.15.2+kde17.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8598c8aedcd7d7a0e405c238703cc092e13cfddd8cccdc4dce761940ef0676ad +size 51978767 diff --git a/qttools-everywhere-src-5.15.2.tar.xz b/qttools-everywhere-src-5.15.2.tar.xz deleted file mode 100644 index ff73b8e..0000000 --- a/qttools-everywhere-src-5.15.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc -size 8894728 diff --git a/qttools-everywhere-src.obsinfo b/qttools-everywhere-src.obsinfo new file mode 100644 index 0000000..acd58f2 --- /dev/null +++ b/qttools-everywhere-src.obsinfo @@ -0,0 +1,5 @@ +name: qttools-everywhere-src +version: 5.15.2+kde17 +mtime: 1606896391 +commit: 33693a928986006d79c1ee743733cde5966ac402 +