Update to 6.5.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-translations?expand=0&rev=30

qt6-translations.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  3 10:02:52 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.5.0
+  * https://www.qt.io/blog/qt-6.5-lts-released
+- Split translations into different subpackages
+
 -------------------------------------------------------------------
 Thu Mar 16 10:00:10 UTC 2023 - Christophe Marin <christophe@krop.fr>
 

qt6-translations.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-translations
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,130 @@
 #
 
 
-%define real_version 6.4.3
+%define real_version 6.5.0
-%define short_version 6.4
+%define short_version 6.5
 %define tar_name qttranslations-everywhere-src
 %define tar_suffix %{nil}
 #
 Name:           qt6-translations
-Version:        6.4.3
+Version:        6.5.0
 Release:        0
 Summary:        Qt 6 Translations
 License:        GPL-3.0-only WITH Qt-GPL-exception-1.0
 URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
-BuildRequires:  fdupes
+BuildRequires:  cmake(Qt6Core) = %{real_version}
-BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6LinguistTools) = %{real_version}
-BuildRequires:  cmake(Qt6LinguistTools) >= %{real_version}
+# This package contains translations that can't go anywhere else
+# TODO double check
+Requires:       libQt6Core6 = %{version}
+Provides:       libQt6Core6-lang-all = %{version}
 BuildArch:      noarch
 
 %description
 Translations for Qt6 libraries and tools.
 
+# All subpackages need to conflict with qt6-translations
+%package -n libQt6Bluetooth6-lang
+Summary:        Translations for package libQt6Bluetooth6
+Requires:       libQt6Bluetooth6
+Conflicts:      qt6-translations < %{version}
+Provides:       libQt6Bluetooth6-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n libQt6Bluetooth6-lang
+Provides translations for the "libQt6Bluetooth6" package.
+
+%package -n qt6-tools-assistant-lang
+Summary:        Translations for package qt6-tools-assistant
+Requires:       qt6-tools-assistant
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-tools-assistant-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-tools-assistant-lang
+Provides translations for the "qt6-tools-assistant" package.
+
+%package -n qt6-tools-designer-lang
+Summary:        Translations for package qt6-tools-designer
+Requires:       qt6-tools-designer
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-tools-designer-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-tools-designer-lang
+Provides translations for the "qt6-tools-designer" package.
+
+%package -n qt6-tools-linguist-lang
+Summary:        Translations for package qt6-tools-linguist
+Requires:       qt6-tools-linguist
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-tools-linguist-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-tools-linguist-lang
+Provides translations for the "qt6-tools-linguist" package.
+
+%package -n qt6-declarative-lang
+Summary:        Translations for package qt6-declarative
+Requires:       qt6-declarative
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-declarative-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-declarative-lang
+Provides translations for the "qt6-declarative" package.
+
+%package -n qt6-positioning-lang
+Summary:        Translations for package qt6-positioning
+Requires:       qt6-positioning
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-positioning-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-positioning-lang
+Provides translations for the "qt6-positioning" package.
+
+%package -n qt6-multimedia-lang
+Summary:        Translations for package qt6-multimedia
+Requires:       qt6-multimedia
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-multimedia-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-multimedia-lang
+Provides translations for the "qt6-multimedia" package.
+
+%package -n qt6-serialport-lang
+Summary:        Translations for package qt6-serialport
+Requires:       qt6-serialport
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-serialport-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-serialport-lang
+Provides translations for the "qt6-serialport" package.
+
+%package -n qt6-webengine-lang
+Summary:        Translations for package qt6-webengine
+Requires:       qt6-webengine
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-webengine-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-webengine-lang
+Provides translations for the "qt6-webengine" package.
+
+%package -n qt6-websockets-lang
+Summary:        Translations for package qt6-websockets
+Requires:       qt6-websockets
+Conflicts:      qt6-translations < %{version}
+Provides:       qt6-websockets-lang-all = %{version}
+BuildArch:      noarch
+
+%description -n qt6-websockets-lang
+Provides translations for the "qt6-websockets" package.
+
 %prep
 %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
 
@@ -47,10 +151,47 @@ Translations for Qt6 libraries and tools.
 %install
 %{qt6_install}
 
-%fdupes %{buildroot}%{_qt6_translationsdir}
+# Broken and obsolete translations
+find %{buildroot}%{_qt6_translationsdir} -regextype sed -regex '.*/qt_[a-z]*.qm' -delete
+rm %{buildroot}%{_qt6_translationsdir}/qt_{pt_BR,pt_PT,zh_CN,zh_TW}.qm
 
 %files
 %license LICENSES/*
-%{_qt6_translationsdir}/*
+# Contains translations for messages in various qtbase libraries
+%{_qt6_translationsdir}/qtbase_*.qm
+
+%files -n qt6-tools-assistant-lang
+%{_qt6_translationsdir}/assistant_*.qm
+%{_qt6_translationsdir}/qt_help_*.qm
+
+%files -n qt6-tools-designer-lang
+%{_qt6_translationsdir}/designer_*.qm
+
+%files -n qt6-tools-linguist-lang
+%{_qt6_translationsdir}/linguist_*.qm
+# TODO: Check what this could be
+%{_qt6_translationsdir}/catalogs.json
+
+%files -n libQt6Bluetooth6-lang
+%{_qt6_translationsdir}/qtconnectivity_*.qm
+
+%files -n qt6-declarative-lang
+%{_qt6_translationsdir}/qtdeclarative_*.qm
+
+%files -n qt6-positioning-lang
+# Files were moved upstream but the translation files weren't renamed
+%{_qt6_translationsdir}/qtlocation_*.qm
+
+%files -n qt6-multimedia-lang
+%{_qt6_translationsdir}/qtmultimedia_*.qm
+
+%files -n qt6-serialport-lang
+%{_qt6_translationsdir}/qtserialport_*.qm
+
+%files -n qt6-webengine-lang
+%{_qt6_translationsdir}/qtwebengine_*.qm
+
+%files -n qt6-websockets-lang
+%{_qt6_translationsdir}/qtwebsockets_*.qm
 
 %changelog

qttranslations-everywhere-src-6.4.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79e56b7800d49649a8a8010818538c367a829e0b7a09d5f60bd3aecf5abe972c
-size 1466828

qttranslations-everywhere-src-6.5.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc85d0fd8393f518653ccada1014177a56df6e73f30f3b64eea0c2e4a0067a3d
+size 1467780