Accepting request 1319405 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1319405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kid3?expand=0&rev=46

kid3-3.9.6.tar.xz

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

kid3-3.9.6.tar.xz.sig

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQR9CXlMKBL2IZSwgcFMrTRCbjVN0gUCZu5t/wAKCRBMrTRCbjVN
-0ogZAJ4tADiecGFO8Pz/QQzSOTp1eNKgcQCgiCtfEIW/NMn1pVVeleLDx1JUEjI=
-=Hl+z
------END PGP SIGNATURE-----

kid3-3.9.7.tar.xz

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

kid3-3.9.7.tar.xz.sig

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQR9CXlMKBL2IZSwgcFMrTRCbjVN0gUCaIHVJgAKCRBMrTRCbjVN
+0rzRAKDSzY7woXtQfYF9f6m5g7OpvpqeygCeL0iZ/57BTfXqtfJCR4DeI1GavtE=
+=YJxS
+-----END PGP SIGNATURE-----

kid3.changes

@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Sat Nov 22 21:19:59 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
+
+- Remove unused BuildRequires: update-desktop-files.
+
+-------------------------------------------------------------------
+Thu Jul 24 11:54:41 UTC 2025 - enzokiel@kabelmail.de
+
+- Update to version 3.9.7
+  * Fixed:
+    + KDE: Avoid excessive width of file dialog.
+    + Make Chapters frames accessible via kid3-cli.
+    + Superfluous imported tracks can be deleted before import.
+    + Fix creation of wrong editor in frame table after selection
+      change.
+    + Completions with different values when selecting multiple
+      files now also support genre.
+    + Do not leave temporary cover art files on the system.
+    + EmbedLyrics.qml: Remove illegal characters for query
+      parameters.
+    + Scripting: Fix crash if execute @qml is used from kid3-cli,
+      fix isStandalone() when running non-interactively with
+      kid3-cli, add new script SelectChapterTags.qml.
+    + Build system: Don't hardcode WITH_DATAROOTDIR_DEFAULT path,
+      support CMake option BUILD_WITH_QT5 to force using Qt5,
+      support Qt 6/KDE 6 on Debian, add various new CI/CD targets,
+      improve Snap support.
+
+-------------------------------------------------------------------
+Mon Mar 31 07:39:15 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use pkgconfig(libavcodec) to allow building with ffmpeg-*-mini.
+
+-------------------------------------------------------------------
+Fri Jan 24 15:03:39 UTC 2025 - Dave Plater <davejplater@gmail.com>
+
+- Force to build with ffmpeg-7
+
+-------------------------------------------------------------------
+Thu Oct 31 05:57:28 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
+
+- build with qt6 (the default in upstream provided binaries)
+  (only on suse_version > 15.0)
+
 -------------------------------------------------------------------
 Sat Sep 21 18:03:30 UTC 2024 - enzokiel@kabelmail.de
 
@@ -1207,7 +1251,6 @@ Sat Mar 6 23:32:09 MST 2010 - zOOmER.gm@gmail.com - 1.4
      edited, and then copied to the other tag.
   ++ Adapted to Discogs server update.
 
--------------------------------------------------------------------
 
 - removed unnecessary BuildRequires
 - fixed file list for older distributions

kid3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kid3
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,14 @@
 
 # Internal QML imports
 %global __requires_exclude qmlimport\\(Kid3.*
+%if 0%{?suse_version} > 1500
+%define qt_version 6
+%else
+%define qt_version 5
+%endif
 
 Name:           kid3
-Version:        3.9.6
+Version:        3.9.7
 Release:        0
 Summary:        Efficient ID3 Tag Editor
 License:        GPL-2.0-or-later
@@ -31,29 +36,29 @@ Source1:        https://download.kde.org/stable/%{name}/%{version}/%{name}-%{ver
 BuildRequires:  extra-cmake-modules
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  id3lib-devel
-BuildRequires:  kf5-filesystem
+BuildRequires:  kf%{qt_version}-filesystem
 BuildRequires:  libxslt-tools
 BuildRequires:  python3 >= 3.6
 BuildRequires:  readline-devel
-BuildRequires:  update-desktop-files
-BuildRequires:  cmake(KF5DocTools)
-BuildRequires:  cmake(KF5KIO)
+BuildRequires:  cmake(KF%{qt_version}DocTools)
+BuildRequires:  cmake(KF%{qt_version}KIO)
+BuildRequires:  cmake(Qt%{qt_version}Core)
+BuildRequires:  cmake(Qt%{qt_version}DBus)
+BuildRequires:  cmake(Qt%{qt_version}Gui)
+BuildRequires:  cmake(Qt%{qt_version}LinguistTools)
+BuildRequires:  cmake(Qt%{qt_version}Multimedia)
+BuildRequires:  cmake(Qt%{qt_version}Network)
+BuildRequires:  cmake(Qt%{qt_version}Qml)
+BuildRequires:  cmake(Qt%{qt_version}Quick)
+BuildRequires:  cmake(Qt%{qt_version}Test)
+BuildRequires:  cmake(Qt%{qt_version}UiTools)
+BuildRequires:  cmake(Qt%{qt_version}Widgets)
+BuildRequires:  cmake(Qt%{qt_version}Xml)
 BuildRequires:  config(docbook-xsl-stylesheets)
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Multimedia)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5UiTools)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  pkgconfig(gstreamer-1.0)
-BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavcodec) >= 61
 BuildRequires:  pkgconfig(libavformat)
-BuildRequires:  pkgconfig(libavresample)
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libchromaprint)
 BuildRequires:  pkgconfig(libswresample)
@@ -184,18 +189,25 @@ This package contains common libraries and data files used by kid3, kid3-qt, and
 %autosetup -p1
 
 %build
+export LC_ALL=en_US.UTF-8
 options+="-DWITH_LIBDIR=%{_lib}/kid3 -DWITH_PLUGINSDIR=%{_lib}/kid3/plugins "
 options+="-DWITH_CHROMAPRINT_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=ON "
 options+="-DWITH_DOCDIR=share/doc/packages/kid3-qt "
-options+="-DCMAKE_SKIP_RPATH=ON -DWITH_QMLDIR=%{_lib}/qt5/qml/kid3 "
+options+="-DCMAKE_SKIP_RPATH=ON -DWITH_QMLDIR=%{_lib}/qt%{qt_version}/qml/kid3 "
+%if %{qt_version} == 6
+%{cmake_kf6} -DBUILD_WITH_QT6=ON $options
+%{kf6_build}
+%else
 %cmake_kf5 -d build -- $options
-export LANG=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-
-LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 %make_jobs
+%make_jobs
+%endif
 
 %install
+%if %{qt_version} == 6
+%{kf6_install}
+%else
 %kf5_makeinstall -C build
+%endif
 
 pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 gzip -dS .svgz kid3.svgz
@@ -217,11 +229,11 @@ EOF
 
 %files
 %dir %{_datadir}/metainfo
-%{_kf5_bindir}/kid3
-%{_kf5_iconsdir}/hicolor/*/apps/kid3.*
-%{_kf5_kxmlguidir}/kid3/
-%{_kf5_applicationsdir}/org.kde.kid3.desktop
-%{_kf5_appstreamdir}/org.kde.kid3.appdata.xml
+%{expand:%{_kf%{qt_version}_bindir}}/kid3
+%{expand:%{_kf%{qt_version}_iconsdir}}/hicolor/*/apps/kid3.*
+%{expand:%{_kf%{qt_version}_kxmlguidir}}/kid3/
+%{expand:%{_kf%{qt_version}_applicationsdir}}/org.kde.kid3.desktop
+%{expand:%{_kf%{qt_version}_appstreamdir}}/org.kde.kid3.appdata.xml
 
 %files qt
 %dir %{_datadir}/metainfo
@@ -241,14 +253,14 @@ EOF
 %doc AUTHORS ChangeLog README
 %license COPYING LICENSE
 %{_libdir}/kid3/
-%{_libdir}/qt5/qml/kid3/
+%{_libdir}/qt%{qt_version}/qml/kid3/
 %config %{_sysconfdir}/ld.so.conf.d/kid3.conf
 %{_datadir}/dbus-1/interfaces/org.kde.Kid3.xml
 %{_mandir}/man1/kid3.1%{ext_man}
 %{_mandir}/*/man1/kid3.1%{ext_man}
 
 %files doc
-%doc %{_kf5_htmldir}/*/kid3/
+%doc %{expand:%{_kf%{qt_version}_htmldir}}/*/kid3/
 
 %files qt-doc
 %{_docdir}/kid3-qt/