#3 24.01.85
Closed 5 months ago by aleasto. Opened 5 months ago by loise.
Unknown source rawhide  into  rawhide

file modified
+1
@@ -57,3 +57,4 @@

  /k3b-23.08.0.tar.xz

  /k3b-23.08.1.tar.xz

  /k3b-23.08.2.tar.xz

+ /k3b-24.01.85.tar.xz

file modified
+58 -65
@@ -1,26 +1,16 @@

- # do not use webkit on rhel

- %if 0%{?fedora} || 0%{?epel}

- %define webkit 1

- %endif

- 

  # trim changelog included in binary rpms

  %global _changelog_trimtime %(date +%s -d "1 year ago")

  

  Name:    k3b

  Summary: CD/DVD/Blu-ray burning application

  Epoch:   1

- Version: 23.08.2

+ Version: 24.01.85

  Release: 1%{?dist}

  

  License: GPL-2.0-or-later

- URL:     http://www.k3b.org/

- %global revision %(echo %{version} | cut -d. -f3)

- %if %{revision} >= 50

- %global stable unstable

- %else

- %global stable stable

- %endif

- Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz

+ URL:     https://invent.kde.org/multimedia/k3b

+ 

+ Source0: http://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz

  

  ## upstream patches

  
@@ -28,35 +18,35 @@

  

  ## downstream patches

  

+ BuildRequires: gcc-c++

+ BuildRequires: cmake

  BuildRequires: desktop-file-utils

  BuildRequires: libappstream-glib

- 

- BuildRequires: cmake(Qt5Gui)

- %if 0%{?webkit}

- BuildRequires: cmake(Qt5WebKitWidgets)

- %endif

- 

  BuildRequires: extra-cmake-modules

- BuildRequires: kf5-rpm-macros

- BuildRequires: cmake(KF5Archive)

- BuildRequires: cmake(KF5Config)

- BuildRequires: cmake(KF5CoreAddons)

- BuildRequires: cmake(KF5DocTools)

- BuildRequires: cmake(KF5FileMetaData)

- BuildRequires: cmake(KF5I18n)

- BuildRequires: cmake(KF5IconThemes)

- BuildRequires: cmake(KF5JobWidgets)

- BuildRequires: cmake(KF5KCMUtils)

- BuildRequires: cmake(KF5KIO)

- BuildRequires: cmake(KF5Notifications)

- BuildRequires: cmake(KF5NewStuff)

- BuildRequires: cmake(KF5NotifyConfig)

- BuildRequires: cmake(KF5Service)

- BuildRequires: cmake(KF5Solid)

- BuildRequires: cmake(KF5WidgetsAddons)

- BuildRequires: cmake(KF5XmlGui)

- 

- BuildRequires: kf5-libkcddb-devel

+ BuildRequires: kf6-rpm-macros

+ 

+ BuildRequires: cmake(Qt6Gui)

+ BuildRequires: cmake(Qt6Core5Compat)

+ BuildRequires: cmake(Qt6WebEngineWidgets)

+ 

+ BuildRequires: cmake(KF6Archive)

+ BuildRequires: cmake(KF6Config)

+ BuildRequires: cmake(KF6CoreAddons)

+ BuildRequires: cmake(KF6DocTools)

+ BuildRequires: cmake(KF6FileMetaData)

+ BuildRequires: cmake(KF6I18n)

+ BuildRequires: cmake(KF6IconThemes)

+ BuildRequires: cmake(KF6JobWidgets)

+ BuildRequires: cmake(KF6KCMUtils)

+ BuildRequires: cmake(KF6KIO)

+ BuildRequires: cmake(KF6Notifications)

+ BuildRequires: cmake(KF6NewStuff)

+ BuildRequires: cmake(KF6NotifyConfig)

+ BuildRequires: cmake(KF6Service)

+ BuildRequires: cmake(KF6Solid)

+ BuildRequires: cmake(KF6WidgetsAddons)

+ BuildRequires: cmake(KF6XmlGui)

+ BuildRequires: cmake(KCddb6)

  

  BuildRequires: ffmpeg-free-devel

  BuildRequires: lame-devel
@@ -94,6 +84,9 @@

  BuildRequires: wodim

  Requires: wodim

  

+ # Required qt6-qtwebengine is not available on some arches.

+ ExclusiveArch: %{qt6_qtwebengine_arches}

+ 

  %description

  K3b provides a comfortable user interface to perform most CD/DVD

  burning tasks. While the experienced user can take influence in all
@@ -119,7 +112,8 @@

  

  

  %build

- %cmake_kf5 \

+ %cmake_kf6 \

+   -DQT_MAJOR_VERSION=6 \

    -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=ON \

    -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=ON \

    -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=ON
@@ -134,47 +128,46 @@

  

  

  %check

- appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.k3b.appdata.xml

- desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.k3b.desktop

+ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.k3b.appdata.xml

+ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.k3b.desktop

  

  

  %files -f %{name}.lang

  %doc README*

  %license LICENSES/*

- %{_kf5_bindir}/k3b

- %{_kf5_metainfodir}/org.kde.k3b.appdata.xml

- %{_kf5_datadir}/applications/org.kde.k3b.desktop

- %{_kf5_datadir}/knotifications5/k3b.*

+ %{_kf6_bindir}/k3b

+ %{_kf6_metainfodir}/org.kde.k3b.appdata.xml

+ %{_kf6_datadir}/applications/org.kde.k3b.desktop

+ %{_kf6_datadir}/knotifications6/k3b.*

  %{_datadir}/knsrcfiles/k3btheme.knsrc

- %{_kf5_datadir}/konqsidebartng/virtual_folders/services/*.desktop

- %{_kf5_datadir}/kservices5/*

- %{_kf5_datadir}/kservicetypes5/*

- %{_kf5_datadir}/kxmlgui5/k3b/

- %{_kf5_datadir}/solid/actions/k3b*.desktop

- %{_kf5_datadir}/mime/packages/x-k3b.xml

- %{_kf5_datadir}/icons/hicolor/*/*/*

- %{_kf5_datadir}/k3b/

- %{_kf5_datadir}/qlogging-categories5/k3b.categories

- %{_libexecdir}/kf5/kauth/k3bhelper

+ %{_kf6_datadir}/konqsidebartng/virtual_folders/services/*.desktop

+ %{_kf6_datadir}/solid/actions/k3b*.desktop

+ %{_kf6_datadir}/mime/packages/x-k3b.xml

+ %{_kf6_datadir}/icons/hicolor/*/*/*

+ %{_kf6_datadir}/k3b/

+ %{_kf6_datadir}/kio/servicemenus/*

+ %{_kf6_datadir}/qlogging-categories6/k3b.categories

+ %{_libexecdir}/kf6/kauth/k3bhelper

  %{_datadir}/dbus-1/system-services/org.kde.k3b.service

  %{_datadir}/dbus-1/system.d/org.kde.k3b.conf

  %{_datadir}/polkit-1/actions/org.kde.k3b.policy

  

- %ldconfig_scriptlets libs

- 

  %files libs

- %{_kf5_libdir}/libk3bdevice.so.*

- %{_kf5_libdir}/libk3blib.so.*

- %{_kf5_qtplugindir}/k3b_plugins

- %{_kf5_plugindir}/kio/videodvd.so

+ %{_kf6_libdir}/libk3bdevice.so.*

+ %{_kf6_libdir}/libk3blib.so.*

+ %{_kf6_qtplugindir}/k3b_plugins

+ %{_kf6_plugindir}/kio/videodvd.so

  

  %files devel

  %{_includedir}/k3b*.h

- %{_kf5_libdir}/libk3bdevice.so

- %{_kf5_libdir}/libk3blib.so

+ %{_kf6_libdir}/libk3bdevice.so

+ %{_kf6_libdir}/libk3blib.so

  

  

  %changelog

+ * Sun Dec 31 2023 Marie Loise Nolden <loise@kde.org> - 24.01.85-1

+ - 24.01.85 using Qt6/KF6

+ 

  * Thu Oct 12 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 1:23.08.2-1

  - 23.08.2

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (k3b-23.08.2.tar.xz) = 718e03c88a0bb52bd7cf6c1e78d9bd1ed44b90b1bcaadf7861edd6d5ac96e99c2da366b011561f99b2e473fdd999ac277ababd93990d52a68d6af19454ae970f

+ SHA512 (k3b-24.01.85.tar.xz) = ce851692254ab2594dcbd92308806e00538441e0fdb21f6bdd1dc6e01046c589042cb77b37108007538ead490878cf8a8f3e588588e1a3f1fd7e74bd9f511f79

Update to 24.01.85 using Qt6/KF6
- uses libkcddb for Qt6, so this has to be build first

I rebased this over rawhide which had changes, made Qt6WebEngineWidgets optional, and pushed

Pull-Request has been closed by aleasto

5 months ago