Accepting request 1322622 from KDE:Applications

- Update to 25.12.0
  * New feature release
  * For more details please see:
  * https://kde.org/announcements/gear/25.12.0/
- No code change since 25.11.80
- Update to 25.11.80
  * New feature release
- No code change since 25.08.3

OBS-URL: https://build.opensuse.org/request/show/1322622
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libkcddb?expand=0&rev=110

_multibuild

@@ -1,3 +1,3 @@
 <multibuild>
-  <flavor>qt6</flavor>
+  <package>libkcddb-qt6</package>
 </multibuild>

libkcddb-25.12.0.tar.xz

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

libkcddb-25.12.0.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmkyJUYACgkQu0YzUNbv
+Me8Ckg//drzZSCQ6eX8JiIoxj/ZarKhFcatI63UHQe6LML3Vo5JhgSXgWf5ugkC+
+EsDuZvztKaSJa/EEU+sPCPaMy5SAvNxQYAOuohTPYyOADsPYfw51t6XYGTR2+oqo
+9BxUCgTdu0K2tp0fIoC+3L6Go+sRV4l/o6nuj5feOF+TmCn1QncN9x8hzo+4cXKH
+ClYNx/6EQ7PtlpRIgUHWQGLyJ/OZQAen3qfY9BY7WJIRiH8c5+GCzHqkOo/PUsmL
+RoPa4Lm2fjQLIArsNS7XOwyO535bBBjhjl2nsk3ebtVzmbcN4UWmMHGgcp4yyn/J
+19PHlDtxta8nxka9jHlkk9b+yn90Klec28pBF0XAazeyd1YB9i0oT2VN2+sqZnin
+doGKwkNoIPKpqfIRY927ltFduuIao/t0aImAvFx0Ttlf3iK38qULjwOyCutMdBIb
+YvVaf5R/NX/sCXmxrbTV62rF93mApoFy4sSqQMTzt6PXkk0lWLQc9TWBv3cjj+8P
+nvJqKCvAPabBKae7M43575NSHAww9XpaXbDQkMYe3VpiBFRoFtSnbSYB8m8tOoh8
+3lI/9J2hEPAV8yheDO9hF1fppfypBMywT0hV987NeMR3AQDj0Pl9P3fxJaihxDlW
+N1NkOJB5a7NHPbkO/mQFnMgxBAP+LsJt+sw8cALoEzCb8vIuxnI=
+=Xchc
+-----END PGP SIGNATURE-----

libkcddb-qt6.spec

@@ -0,0 +1,107 @@
+#
+# spec file for package libkcddb
+#
+# 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define rname  libkcddb
+
+%define kf6_version 6.19.0
+%define qt6_version 6.9.0
+
+%bcond_without released
+Name:           libkcddb-qt6
+Version:        25.12.0
+Release:        0
+Summary:        CDDB library for KDE Applications
+License:        GPL-2.0-or-later
+URL:            https://www.kde.org
+Source0:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
+%if %{with released}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(libmusicbrainz5)
+BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
+BuildRequires:  cmake(KF6Config) >= %{kf6_version}
+BuildRequires:  cmake(KF6DocTools) >= %{kf6_version}
+BuildRequires:  cmake(KF6I18n) >= %{kf6_version}
+BuildRequires:  cmake(KF6KCMUtils) >= %{kf6_version}
+BuildRequires:  cmake(KF6KIO) >= %{kf6_version}
+BuildRequires:  cmake(KF6WidgetsAddons) >= %{kf6_version}
+BuildRequires:  cmake(Qt6Network) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
+# FIXME upstream bug, conflicting kcfg and desktop files
+Conflicts:      libkcddb
+Obsoletes:      libkcddb-lang
+
+%description
+The KDE Compact Disc DataBase library provides an API for applications to fetch
+and submit audio CD information over the Internet.
+
+%package -n libKCddb5
+Summary:        CDDB library for KDE Applications
+Recommends:     libkcddb-qt6 >= %{version}
+
+%description -n libKCddb5
+The KDE Compact Disc DataBase library provides an API for applications to fetch
+and submit audio CD information over the Internet.
+
+%package devel
+Summary:        Development files for KDE CDDB library
+Requires:       libKCddb5 = %{version}
+
+%description devel
+This package includes the development headers for libkcddb.
+
+%lang_package
+
+%prep
+%autosetup -p1 -n %{rname}-%{version}
+
+%build
+%cmake_kf6
+
+%kf6_build
+
+%install
+%kf6_install
+
+%find_lang %{name} --with-html --all-name
+
+%ldconfig_scriptlets -n libKCddb5
+
+%files
+%doc %lang(en) %{_kf6_htmldir}/en/*/
+%{_kf6_applicationsdir}/kcm_cddb.desktop
+%{_kf6_configkcfgdir}/libkcddb5.kcfg
+%{_kf6_debugdir}/libkcddb.categories
+%{_kf6_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_cddb.so
+
+%files -n libKCddb5
+%license LICENSES/*
+%{_kf6_libdir}/libKCddb6.so.*
+
+%files devel
+%{_includedir}/KCddb6/
+%{_kf6_cmakedir}/KCddb6/
+%{_kf6_libdir}/libKCddb6.so
+%{_kf6_mkspecsdir}/qt_KCddb.pri
+
+%files lang -f %{name}.lang
+%exclude %{_kf6_htmldir}/en/*/
+
+%changelog

libkcddb.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Sat Dec  6 11:41:06 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.12.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.12.0/
+- No code change since 25.11.80
+
+-------------------------------------------------------------------
+Sat Nov 15 19:57:10 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.11.80
+  * New feature release
+- No code change since 25.08.3
+
+-------------------------------------------------------------------
+Thu Nov  6 18:38:06 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.08.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.08.3/
+- No code change since 25.08.2
+
+-------------------------------------------------------------------
+Tue Oct  7 18:49:31 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.08.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.08.2/
+- No code change since 25.08.1
+
+-------------------------------------------------------------------
+Wed Sep 10 09:24:14 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.08.1
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.08.1/
+- No code change since 25.08.0
+
+-------------------------------------------------------------------
+Fri Aug  8 07:48:01 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.08.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.08.0/
+- No code change since 25.07.80
+
+-------------------------------------------------------------------
+Mon Jul 14 14:25:48 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.07.80
+  * New feature release
+- Changes since 25.04.3:
+  * Fixed building when DocTools is disabled.
+  * Remove Qt5 support
+  * Updated name for id3v1 genre 133
+- Keep a Qt5 based build until soundkonverter is dropped from factory
+
 -------------------------------------------------------------------
 Tue Jul  1 15:27:26 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

libkcddb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libkcddb
 #
-# Copyright (c) 2025 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
@@ -16,51 +16,24 @@
 #
 
 
-%define rname  libkcddb
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "qt6"
-%define qt6 1
-%define pkg_suffix -qt6
-%define kf6_version 6.6.0
-%define qt6_version 6.6.0
-%define library_name libKCddb5
-%define so_suffix -5
-%else
-%define qt5 1
 %define kf5_version 5.92.0
 %define qt5_version 5.15.2
-%define library_name libKF5Cddb5
-%define so_suffix 5
-%endif
-
+# For KDE unstable applications repository
+%define rversion 25.04.3
 %bcond_without released
-Name:           libkcddb%{?pkg_suffix}
+Name:           libkcddb
 Version:        25.04.3
 Release:        0
 Summary:        CDDB library for KDE Applications
 License:        GPL-2.0-or-later
 URL:            https://www.kde.org
-Source0:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
+Source0:        https://download.kde.org/stable/release-service/%{rversion}/src/%{name}-%{rversion}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/stable/release-service/%{rversion}/src/%{name}-%{rversion}.tar.xz.sig
 Source2:        applications.keyring
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libmusicbrainz5)
-%if 0%{?qt6}
-BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
-BuildRequires:  cmake(KF6Config) >= %{kf6_version}
-BuildRequires:  cmake(KF6DocTools) >= %{kf6_version}
-BuildRequires:  cmake(KF6I18n) >= %{kf6_version}
-BuildRequires:  cmake(KF6KCMUtils) >= %{kf6_version}
-BuildRequires:  cmake(KF6KIO) >= %{kf6_version}
-BuildRequires:  cmake(KF6WidgetsAddons) >= %{kf6_version}
-BuildRequires:  cmake(Qt6Network) >= %{qt6_version}
-BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
-# FIXME upstream bug, conflicting kcfg and desktop files
-Conflicts:      libkcddb
-Obsoletes:      libkcddb-lang
-%else
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  cmake(KF5KCMUtils) >= %{kf5_version}
 BuildRequires:  cmake(KF5Config) >= %{kf5_version}
@@ -70,31 +43,28 @@ BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
 BuildRequires:  cmake(KF5WidgetsAddons) >= %{kf5_version}
 BuildRequires:  cmake(Qt5Network) >= %{qt5_version}
 BuildRequires:  cmake(Qt5Widgets) >= %{qt5_version}
-Provides:       libkcddb5 = %{version}
-Obsoletes:      libkcddb5 < %{version}
-Provides:       libkcddb16 = %{version}
-Obsoletes:      libkcddb16 < %{version}
-%endif
+Provides:       libkcddb5 = %{rversion}
+Obsoletes:      libkcddb5 < %{rversion}
+Provides:       libkcddb16 = %{rversion}
+Obsoletes:      libkcddb16 < %{rversion}
 
 %description
 The KDE Compact Disc DataBase library provides an API for applications to fetch
 and submit audio CD information over the Internet.
 
-%package -n %{library_name}
+%package -n libKF5Cddb5
 Summary:        CDDB library for KDE Applications
-Recommends:     %{name} >= %{version}
+Recommends:     %{name} >= %{rversion}
 
-%description -n %{library_name}
+%description -n libKF5Cddb5
 The KDE Compact Disc DataBase library provides an API for applications to fetch
 and submit audio CD information over the Internet.
 
 %package devel
 Summary:        Development files for KDE CDDB library
-Requires:       %{library_name} = %{version}
-%if 0%{?qt5}
-Provides:       libkcddb5-devel = %{version}
-Obsoletes:      libkcddb5-devel < %{version}
-%endif
+Requires:       libKF5Cddb5 = %{rversion}
+Provides:       libkcddb5-devel = %{rversion}
+Obsoletes:      libkcddb5-devel < %{rversion}
 
 %description devel
 This package includes the development headers for libkcddb.
@@ -102,36 +72,20 @@ This package includes the development headers for libkcddb.
 %lang_package
 
 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{name}-%{rversion}
 
 %build
-%if 0%{?qt6}
-%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
-%kf6_build
-%else
 %cmake_kf5 -d build
 %cmake_build
-%endif
 
 %install
-%if 0%{?qt6}
-%kf6_install
-%else
 %kf5_makeinstall -C build
-%endif
 
 %find_lang %{name} --with-html --all-name
 
-%ldconfig_scriptlets -n %{library_name}
+%ldconfig_scriptlets -n libKF5Cddb5
 
 %files
-%if 0%{?qt6}
-%doc %lang(en) %{_kf6_htmldir}/en/*/
-%{_kf6_applicationsdir}/kcm_cddb.desktop
-%{_kf6_configkcfgdir}/libkcddb5.kcfg
-%{_kf6_debugdir}/libkcddb.categories
-%{_kf6_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_cddb.so
-%else
 %doc %lang(en) %{_kf5_htmldir}/en/*/
 %{_kf5_applicationsdir}/kcm_cddb.desktop
 %{_kf5_configkcfgdir}/libkcddb5.kcfg
@@ -140,35 +94,19 @@ This package includes the development headers for libkcddb.
 %dir %{_kf5_plugindir}/plasma/kcms
 %dir %{_kf5_plugindir}/plasma/kcms/systemsettings_qwidgets
 %{_kf5_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_cddb.so
-%endif
 
-%files -n %{library_name}
+%files -n libKF5Cddb5
 %license LICENSES/*
-%if 0%{?qt6}
-%{_kf6_libdir}/libKCddb6.so.*
-%else
 %{_kf5_libdir}/libKF5Cddb.so.*
-%endif
 
 %files devel
-%if 0%{?qt6}
-%{_includedir}/KCddb6/
-%{_kf6_cmakedir}/KCddb6/
-%{_kf6_libdir}/libKCddb6.so
-%{_kf6_mkspecsdir}/qt_KCddb.pri
-%else
 %{_includedir}/KCddb5/
 %{_kf5_cmakedir}/KF5Cddb/
 %{_kf5_includedir}/KCddb/
 %{_kf5_libdir}/libKF5Cddb.so
 %{_kf5_mkspecsdir}/qt_KCddb.pri
-%endif
 
 %files lang -f %{name}.lang
-%if 0%{?qt6}
-%exclude %{_kf6_htmldir}/en/*/
-%else
 %exclude %{_kf5_htmldir}/en/*/
-%endif
 
 %changelog