From 1139c13d198b9dd3ca8c777aa33a05e2b0512d4675d9e90a0440a8c48322d4ba Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 16 Mar 2023 14:42:36 +0000 Subject: [PATCH] Accepting request 1072393 from home:krop:Qt6:Release Update to 6.4.3 OBS-URL: https://build.opensuse.org/request/show/1072393 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=37 --- qt6-tools.changes | 12 ++----- qt6-tools.spec | 50 ++++++++++++++--------------- qttools-everywhere-src-6.4.2.tar.xz | 3 -- qttools-everywhere-src-6.4.3.tar.xz | 3 ++ 4 files changed, 31 insertions(+), 37 deletions(-) delete mode 100644 qttools-everywhere-src-6.4.2.tar.xz create mode 100644 qttools-everywhere-src-6.4.3.tar.xz diff --git a/qt6-tools.changes b/qt6-tools.changes index 6f5c823..4ae6ffe 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,14 +1,8 @@ ------------------------------------------------------------------- -Wed Jan 11 20:07:37 UTC 2023 - Antonio Larrosa +Thu Mar 16 10:00:10 UTC 2023 - Christophe Marin -- Leap 15.4 doesn't have llvm11 but llvm13 so just use that in - SP4 and llvm15 in SP5. - -------------------------------------------------------------------- -Wed Jan 11 19:29:26 UTC 2023 - Antonio Larrosa - -- Fix condition to use llvm11 in SLE 15 SP5 instead of the default - llvm7. +- Update to 6.4.3: + * https://www.qt.io/blog/qt-6.4.3-released ------------------------------------------------------------------- Fri Jan 6 16:46:53 UTC 2023 - Christophe Marin diff --git a/qt6-tools.spec b/qt6-tools.spec index 1626d1e..9bfbb79 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -16,7 +16,7 @@ # -%define real_version 6.4.2 +%define real_version 6.4.3 %define short_version 6.4 %define tar_name qttools-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-tools%{?pkg_suffix} -Version: 6.4.2 +Version: 6.4.3 Release: 0 Summary: Qt 6 Tools libraries and tools # TODO Check if it's still valid @@ -123,10 +123,10 @@ This package contains the Qt 6 Designer Library. %package -n qt6-designer-devel Summary: Qt 6 Designer libraries - Development files Requires: libQt6Designer6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6OpenGLWidgets) -Requires: cmake(Qt6Widgets) -Requires: cmake(Qt6Xml) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6OpenGLWidgets) = %{real_version} +Requires: cmake(Qt6Widgets) = %{real_version} +Requires: cmake(Qt6Xml) = %{real_version} %description -n qt6-designer-devel Development files for the Qt6 Designer libraries. @@ -151,10 +151,10 @@ This package contains the Qt 6 Help library. %package -n qt6-help-devel Summary: Qt 6 Help library - Development files Requires: libQt6Help6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6Network) -Requires: cmake(Qt6Sql) -Requires: cmake(Qt6Widgets) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6Network) = %{real_version} +Requires: cmake(Qt6Sql) = %{real_version} +Requires: cmake(Qt6Widgets) = %{real_version} %description -n qt6-help-devel Development files for the Qt6 Help library. @@ -177,11 +177,11 @@ This package contains the Qt 6 UiTools library. %package -n qt6-uitools-devel Summary: Qt 6 UiTools library - Development files Requires: libQt6UiTools6 = %{version} -Requires: cmake(Qt6Gui) -Requires: cmake(Qt6OpenGL) -Requires: cmake(Qt6OpenGLWidgets) -Requires: cmake(Qt6UiPlugin) -Requires: cmake(Qt6Widgets) +Requires: cmake(Qt6Gui) = %{real_version} +Requires: cmake(Qt6OpenGL) = %{real_version} +Requires: cmake(Qt6OpenGLWidgets) = %{real_version} +Requires: cmake(Qt6UiPlugin) = %{real_version} +Requires: cmake(Qt6Widgets) = %{real_version} # qt6uitools_*_metatypes.json location fixed Conflicts: qt6-designer-devel < 6.2.2 @@ -262,8 +262,8 @@ This library does not have any ABI or API guarantees. Summary: Development files for the Qt 6 DesignerComponents library Requires: libQt6DesignerComponents6 = %{version} Requires: qt6-designer-private-devel = %{version} -Requires: cmake(Qt6Core) -Requires: cmake(Qt6Xml) +Requires: cmake(Qt6Core) = %{real_version} +Requires: cmake(Qt6Xml) = %{real_version} %requires_eq qt6-gui-private-devel %requires_eq qt6-widgets-private-devel @@ -313,14 +313,10 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{ install -D -m644 src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant6.png install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant6.png -%post -n libQt6Designer6 -p /sbin/ldconfig -%post -n libQt6DesignerComponents6 -p /sbin/ldconfig -%post -n libQt6Help6 -p /sbin/ldconfig -%post -n libQt6UiTools6 -p /sbin/ldconfig -%postun -n libQt6Designer6 -p /sbin/ldconfig -%postun -n libQt6DesignerComponents6 -p /sbin/ldconfig -%postun -n libQt6Help6 -p /sbin/ldconfig -%postun -n libQt6UiTools6 -p /sbin/ldconfig +%ldconfig_scriptlets -n libQt6Designer6 +%ldconfig_scriptlets -n libQt6DesignerComponents6 +%ldconfig_scriptlets -n libQt6Help6 +%ldconfig_scriptlets -n libQt6UiTools6 %files %license LICENSES/* @@ -419,7 +415,11 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{ %{_datadir}/applications/org.qt.designer6.desktop %{_datadir}/icons/hicolor/128x128/apps/designer6.png %{_qt6_bindir}/designer +%{_qt6_pluginsdir}/designer/libcontainerextension.so +%{_qt6_pluginsdir}/designer/libcustomwidgetplugin.so %{_qt6_pluginsdir}/designer/libqquickwidget.so +%{_qt6_pluginsdir}/designer/libtaskmenuextension.so +%{_qt6_pluginsdir}/designer/libworldtimeclockplugin.so %files helpgenerators %{_qt6_libexecdir}/qhelpgenerator diff --git a/qttools-everywhere-src-6.4.2.tar.xz b/qttools-everywhere-src-6.4.2.tar.xz deleted file mode 100644 index 0774969..0000000 --- a/qttools-everywhere-src-6.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a31387916184e4a5ef522d3ea841e8e931cc0f88be0824a7a354a572d5826c68 -size 8740276 diff --git a/qttools-everywhere-src-6.4.3.tar.xz b/qttools-everywhere-src-6.4.3.tar.xz new file mode 100644 index 0000000..b93e4c5 --- /dev/null +++ b/qttools-everywhere-src-6.4.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:867df829cd5cd3ae8efe62e825503123542764b13c96953511e567df70c5a091 +size 8738280