From 01a6f357dd1f0708cf61611cda31f2d5f08c35da6d22fdd87165661f42d37c6a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 17 Nov 2022 22:58:06 +0000 Subject: [PATCH 1/2] KDE release gear 22.12 beta. Don't forward OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=212 --- ...ert-Enable-the-k3b-helper-by-default.patch | 90 +++++++++---------- Don-t-suggest-to-install-libburn.patch | 8 +- k3b-22.08.3.tar.xz | 3 - k3b-22.08.3.tar.xz.sig | 16 ---- k3b-22.11.80.tar.xz | 3 + k3b-22.11.80.tar.xz.sig | 16 ++++ k3b.changes | 6 ++ k3b.spec | 21 ++--- 8 files changed, 82 insertions(+), 81 deletions(-) delete mode 100644 k3b-22.08.3.tar.xz delete mode 100644 k3b-22.08.3.tar.xz.sig create mode 100644 k3b-22.11.80.tar.xz create mode 100644 k3b-22.11.80.tar.xz.sig diff --git a/0001-Revert-Enable-the-k3b-helper-by-default.patch b/0001-Revert-Enable-the-k3b-helper-by-default.patch index 3532793..f3dec16 100644 --- a/0001-Revert-Enable-the-k3b-helper-by-default.patch +++ b/0001-Revert-Enable-the-k3b-helper-by-default.patch @@ -15,31 +15,31 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b. src/option/k3bexternalbinwidget.h | 2 ++ 8 files changed, 42 insertions(+), 1 deletion(-) -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/CMakeLists.txt +Index: k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/CMakeLists.txt 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/CMakeLists.txt 2022-02-26 08:11:04.551478263 +0100 -@@ -35,6 +35,7 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/CMakeLists.txt ++++ k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt +@@ -35,6 +35,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support f option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with optional decryption." ON) option(K3B_ENABLE_TAGLIB "Support for reading audio file metadata using Taglib." ON) option(K3B_BUILD_API_DOCS "Build the API documentation for the K3b libs." OFF) +option(K3B_ENABLE_PERMISSION_HELPER "Build the permissions helper program" OFF) # plugin options - option(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN "Build Ogg-Vorbis decoder plugin" ON) -@@ -204,6 +205,7 @@ + option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON) +@@ -268,6 +269,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}") set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}") +set(ENABLE_PERMISSION_HELPER "${K3B_ENABLE_PERMISSION_HELPER}") - if(IS_ABSOLUTE ${DATA_INSTALL_DIR}) - set(K3B_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/k3b) -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt + if(IS_ABSOLUTE ${KDE_INSTALL_DATADIR}) + set(K3B_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/k3b) +Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/INSTALL.txt 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt 2022-02-26 08:11:04.551478263 +0100 -@@ -42,6 +42,7 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/INSTALL.txt ++++ k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt +@@ -44,6 +44,7 @@ For debug: -DKDE_INSTALL_LIBEXECDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DK3B_BUILD_API_DOCS=ON \ @@ -47,7 +47,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt -DK3B_DEBUG=ON dynamic analyzer and fuzzer: -@@ -54,6 +55,7 @@ +@@ -56,6 +57,7 @@ For debug: -DKDE_INSTALL_LIBEXECDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DK3B_BUILD_API_DOCS=ON \ @@ -55,10 +55,10 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt -DK3B_DEBUG=ON If the cmake run was successful you are presented with a list of configure results that shows -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/config-k3b.h.cmake +Index: k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/config-k3b.h.cmake 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/config-k3b.h.cmake 2022-02-26 08:11:04.551478263 +0100 +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/config-k3b.h.cmake ++++ k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake @@ -20,6 +20,8 @@ #cmakedefine ENABLE_AUDIO_PLAYER @@ -68,10 +68,10 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/config-k3b.h.cmake #cmakedefine HAVE_BYTESWAP_H #cmakedefine WORDS_BIGENDIAN -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/CMakeLists.txt +Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/CMakeLists.txt 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/CMakeLists.txt 2022-02-26 08:11:04.551478263 +0100 +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/CMakeLists.txt ++++ k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt @@ -1,5 +1,7 @@ -add_subdirectory( helper ) @@ -81,11 +81,11 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/CMakeLists.txt add_subdirectory( icons ) add_subdirectory( pics ) -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp +Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bdevicewidget.cpp 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp 2022-02-26 08:11:04.551478263 +0100 -@@ -55,7 +55,9 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bdevicewidget.cpp ++++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp +@@ -55,7 +55,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De m_messageWidget = new KMessageWidget( this ); m_messageWidget->hide(); m_messageWidget->setWordWrap( true ); @@ -95,7 +95,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp // buttons // ------------------------------------------------ -@@ -92,7 +94,9 @@ +@@ -92,7 +94,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De // ------------------------------------------------ connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) ); connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) ); @@ -105,7 +105,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp // ------------------------------------------------ } -@@ -241,10 +245,16 @@ +@@ -241,10 +245,16 @@ void K3b::DeviceWidget::updateDeviceList if (!groupNames.contains(m_deviceGroup)) { QString messageText = i18n("In order to give K3b full access to the writer device the current user needs be added to a group %1.", m_deviceGroup); @@ -122,7 +122,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp m_messageWidget->animatedShow(); } } -@@ -253,6 +263,7 @@ +@@ -253,6 +263,7 @@ void K3b::DeviceWidget::updateDeviceList void K3b::DeviceWidget::addUserToGroup() { @@ -130,17 +130,17 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp QVariantMap args; args["groupName"] = m_deviceGroup; args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name); -@@ -276,4 +287,5 @@ +@@ -276,4 +287,5 @@ void K3b::DeviceWidget::addUserToGroup() } } ); job->start(); +#endif } -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermissionmodel.cpp +Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinpermissionmodel.cpp 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermissionmodel.cpp 2022-02-26 08:11:04.551478263 +0100 -@@ -341,6 +341,7 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinpermissionmodel.cpp ++++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp +@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel:: void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup ) { @@ -148,7 +148,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermis if( burningGroup != d->burningGroup ) { beginResetModel(); d->burningGroup = burningGroup; -@@ -357,6 +358,7 @@ +@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurn } endResetModel(); } @@ -156,11 +156,11 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermis } void ExternalBinPermissionModel::update() -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.cpp +Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinwidget.cpp 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.cpp 2022-02-26 08:11:04.551478263 +0100 -@@ -109,7 +109,12 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.cpp ++++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp +@@ -109,7 +109,12 @@ K3b::ExternalBinWidget::ExternalBinWidge // setup permissions tab // ------------------------------------------------------------ QWidget* permissionsTab = new QWidget( m_mainTabWidget ); @@ -173,7 +173,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget permissionsLabel->setWordWrap( true ); m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab ); m_permissionView = new QTreeView( permissionsTab ); -@@ -117,11 +122,15 @@ +@@ -117,11 +122,15 @@ K3b::ExternalBinWidget::ExternalBinWidge m_permissionView->setAllColumnsShowFocus( true ); m_permissionView->setRootIsDecorated( false ); m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents ); @@ -189,7 +189,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") ); -@@ -140,14 +149,17 @@ +@@ -140,14 +149,17 @@ K3b::ExternalBinWidget::ExternalBinWidge m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") ); @@ -207,7 +207,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget while (::group *g = ::getgrent()) { const QString groupName = QString::fromLocal8Bit(g->gr_name); if (groupName == "cdrom" || -@@ -157,6 +169,7 @@ +@@ -157,6 +169,7 @@ K3b::ExternalBinWidget::ExternalBinWidge } } ::endgrent(); @@ -215,7 +215,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget } -@@ -203,12 +216,15 @@ +@@ -203,12 +216,15 @@ void K3b::ExternalBinWidget::saveSearchP void K3b::ExternalBinWidget::slotPermissionModelChanged() { @@ -231,7 +231,7 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget KAuth::Action action("org.kde.k3b.updatepermissions"); action.setHelperId("org.kde.k3b"); action.setParentWidget(this); -@@ -250,6 +266,7 @@ +@@ -250,6 +266,7 @@ void K3b::ExternalBinWidget::slotChangeP } } ); job->start(); @@ -239,11 +239,11 @@ Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget } -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.h +Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinwidget.h 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.h 2022-02-26 08:11:04.551478263 +0100 -@@ -57,7 +57,9 @@ +--- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.h ++++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h +@@ -57,7 +57,9 @@ namespace K3b { QTreeView* m_permissionView; KEditListWidget* m_searchPathBox; diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch index cf5eddf..9b795f6 100644 --- a/Don-t-suggest-to-install-libburn.patch +++ b/Don-t-suggest-to-install-libburn.patch @@ -13,11 +13,11 @@ People who want to use cdrskin instead can still install it. src/k3bsystemproblemdialog.cpp | 6 ------ 1 file changed, 6 deletions(-) -Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/k3bsystemproblemdialog.cpp +Index: k3b-19.11.70git.20220916T165241~5c732af86/src/k3bsystemproblemdialog.cpp =================================================================== ---- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/k3bsystemproblemdialog.cpp 2022-02-24 16:47:41.000000000 +0100 -+++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/k3bsystemproblemdialog.cpp 2022-02-26 08:10:54.275445434 +0100 -@@ -285,13 +285,6 @@ +--- k3b-19.11.70git.20220916T165241~5c732af86.orig/src/k3bsystemproblemdialog.cpp ++++ k3b-19.11.70git.20220916T165241~5c732af86/src/k3bsystemproblemdialog.cpp +@@ -287,13 +287,6 @@ void K3b::SystemProblemDialog::checkSyst #endif } diff --git a/k3b-22.08.3.tar.xz b/k3b-22.08.3.tar.xz deleted file mode 100644 index 088844d..0000000 --- a/k3b-22.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:893ec15e05376e8cd90b4168b8698c18d8639d9f503ad0fff09ed4c84338e398 -size 10764540 diff --git a/k3b-22.08.3.tar.xz.sig b/k3b-22.08.3.tar.xz.sig deleted file mode 100644 index 0ad9327..0000000 --- a/k3b-22.08.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmNgYyYACgkQu0YzUNbv -Me/NUA/+OczphDNpKEIboB7J/yC2kpx7Z5Kd2QNCUNnYAIr14qawmhWmLm6LUcXR -2bIMGLZpXKCBKJZ00mLT1Qbc7ZseLeL32PkPOPD0wEl4LJ5mesSo/NpjUnAOTibz -Y9H2P5sutzzO7Vs1uDLd1TT3Xk5sy6g9//os8sASqVdSQVz+D1t8UR1qldb4EV3X -VqKeyPdNawcz1IjoIg3zJ7tyNWAi7PkDYywrk3cXTP7AS3xPbE+RyiPKA0ltt7VP -OPyRsYa95zCoom3Q+PJ2KqFWzg/3/pTzzXBRa/SlRU+/qmyvGW4yRz/cM9tpP3Fd -1xHSseDrJLl9CGFwzGlFaaqazc/iP2ZGgtOKymZUenEiZV0qXlkmUqaXyi0KwWM+ -oWaU8hXGjAExmt27gN/bZnXbtxLtGX46r3xGfsUN/XUyBmT9/XPNy1WCVOOKnJWj -4jB05CxXKUJlp6CUUYV9PG3I1IvzZbOP5vDzymcEjASkfHrUcWQT/EGdhnds3uez -YUrxIK7x2sUcf9ulBiY3hIf53jQ3gW7rwg6qafPdZK1hqRSLN6PiQ4pr7CzhJHpo -sEufGg+C1o24VWlTr6Nn75qWawGbx1OQtwUqSRdVLCn5bOF6YDW5g6OY6PciC0b7 -8ZkmrgnGBwL1s+sMl7u7rCKNvtjKNlO+Jpn7khxa+eU5UPQL4ns= -=Uti7 ------END PGP SIGNATURE----- diff --git a/k3b-22.11.80.tar.xz b/k3b-22.11.80.tar.xz new file mode 100644 index 0000000..d80ff7a --- /dev/null +++ b/k3b-22.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e29d5b2d4a859d41c5980ee70d203f03c93e70b281d866ed92924dbce93a90 +size 10945832 diff --git a/k3b-22.11.80.tar.xz.sig b/k3b-22.11.80.tar.xz.sig new file mode 100644 index 0000000..c116911 --- /dev/null +++ b/k3b-22.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmNtkcIACgkQOmpNuDnq +ptdrVA/9HwpOCqb3K3TiGncnP5H0yeScefqwpYF0Vfx2+ftJcWUpe+DhlbvLo338 +g89LpGF1BJ1skpofrvislJGGCjDJbCj/sxcu3qwY1CzfgHvnhFvoITMeo+9A+7Xu +cL+lb9/Q9zPJSfb4NMO5yp7AtlOam5k5fFeG//e+x7+UKlXdpkUSYdat/dHxeIh8 +8jxdhFziC/M6fpd5D5QIqDegoQlwAf6ddEOD2XvcJXnWxPSwIWxrUXd/jSbfD/cQ +Qtalq6EZQHuMCOIX1FnM5bv/npj4NKESLdtP8PQJe4aT8HjrMtQi5eE/VcqVyR5n +ZuS2eDAdkqbySGHMmuFt2U/oIdnSGx9HXK5O/DKU0es4oBeXnB77+tI4vNwTstSE +b8x5X1rUuP7EbFjIVxM5Rt1HyN4LG5l/CzU8F8AFH55YQQQYGtxRHRSTppAhz+Sa +lyj5WYG8O4NMigs7o88OUAZszxEImQ61oqVPzAucWH8FeLNHlj3V7+Ar2BHbGCIC +7PEk3d0pAtfauu4d9rvunWKUeWX3TC75hk1qWIx3CgojYJeTYSqMDy6/yBOSfXGg +uNL0ENrg612iHjKJlOTATkRXC8jH9q+fvgqPbziduIENvmnEtGJBzmFsAf0fSdPZ +5PcvlRB/7SBrVBl9PMeCt1UxU1buNB4ZNX2O/eqBVNJ+O3iZ+OI= +=24gW +-----END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index 9563b21..518e562 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 12 08:53:36 UTC 2022 - Christophe Giboudeaux + +- Update to 22.11.80 + * New feature release + ------------------------------------------------------------------- Tue Nov 1 11:19:57 UTC 2022 - Christophe Giboudeaux diff --git a/k3b.spec b/k3b.spec index b72d4d1..cfff4fd 100644 --- a/k3b.spec +++ b/k3b.spec @@ -1,7 +1,7 @@ # # spec file for package k3b # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +21,14 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 22.08.3 +Version: 22.11.80 Release: 0 Summary: CD/DVD/Blu-ray Burning Application by KDE License: GPL-2.0-or-later -Group: Productivity/Multimedia/CD/Record URL: https://apps.kde.org/k3b -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE @@ -107,7 +106,6 @@ complicated tasks such as audiovisual encoding and decoding. %package devel Summary: Development files for k3b -Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel @@ -125,10 +123,9 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %install %kf5_makeinstall -C build -%if %{with released} - %find_lang %{name} --with-man --all-name - %{kf5_find_htmldocs} -%endif + +%find_lang %{name} --with-man --all-name +%{kf5_find_htmldocs} %suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning @@ -140,7 +137,6 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %files %license LICENSES/* %doc ChangeLog FAQ.txt PERMISSIONS.txt README.txt -%{_kf5_knsrcfilesdir}/k3btheme.knsrc %dir %{_kf5_plugindir}/k3b_plugins/ %dir %{_kf5_plugindir}/k3b_plugins/kcms %dir %{_kf5_plugindir}/kf5/ @@ -157,6 +153,7 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %{_kf5_bindir}/k3b %{_kf5_iconsdir}/hicolor/*/apps/k3b.* %{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-k3b.* +%{_kf5_knsrcfilesdir}/k3btheme.knsrc %{_kf5_kxmlguidir}/k3b %{_kf5_libdir}/libk3bdevice.so.* %{_kf5_libdir}/libk3blib.so.* @@ -176,8 +173,6 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %{_kf5_libdir}/libk3bdevice.so %{_kf5_libdir}/libk3blib.so -%if %{with released} %files lang -f %{name}.lang -%endif %changelog From e972bf248a1be52ff8ad60c77fc2d55460d5a39c5ce42f2313ef18db5b9c2754 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 23 Nov 2022 16:35:24 +0000 Subject: [PATCH 2/2] temporary revert OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=213 --- ...ert-Enable-the-k3b-helper-by-default.patch | 90 +++++++++---------- ...ecessary-and-incorrect-version-check.patch | 30 +++++++ Don-t-suggest-to-install-libburn.patch | 8 +- k3b-22.08.3.tar.xz | 3 + k3b-22.08.3.tar.xz.sig | 16 ++++ k3b-22.11.80.tar.xz | 3 - k3b-22.11.80.tar.xz.sig | 16 ---- k3b.changes | 6 +- k3b.spec | 25 ++++-- 9 files changed, 117 insertions(+), 80 deletions(-) create mode 100644 0001-remove-unnecessary-and-incorrect-version-check.patch create mode 100644 k3b-22.08.3.tar.xz create mode 100644 k3b-22.08.3.tar.xz.sig delete mode 100644 k3b-22.11.80.tar.xz delete mode 100644 k3b-22.11.80.tar.xz.sig diff --git a/0001-Revert-Enable-the-k3b-helper-by-default.patch b/0001-Revert-Enable-the-k3b-helper-by-default.patch index f3dec16..3532793 100644 --- a/0001-Revert-Enable-the-k3b-helper-by-default.patch +++ b/0001-Revert-Enable-the-k3b-helper-by-default.patch @@ -15,31 +15,31 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b. src/option/k3bexternalbinwidget.h | 2 ++ 8 files changed, 42 insertions(+), 1 deletion(-) -Index: k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/CMakeLists.txt =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/CMakeLists.txt -+++ k3b-19.11.70git.20221104T020145~62f96f82f/CMakeLists.txt -@@ -35,6 +35,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support f +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/CMakeLists.txt 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/CMakeLists.txt 2022-02-26 08:11:04.551478263 +0100 +@@ -35,6 +35,7 @@ option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with optional decryption." ON) option(K3B_ENABLE_TAGLIB "Support for reading audio file metadata using Taglib." ON) option(K3B_BUILD_API_DOCS "Build the API documentation for the K3b libs." OFF) +option(K3B_ENABLE_PERMISSION_HELPER "Build the permissions helper program" OFF) # plugin options - option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON) -@@ -268,6 +269,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B + option(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN "Build Ogg-Vorbis decoder plugin" ON) +@@ -204,6 +205,7 @@ set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}") set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}") +set(ENABLE_PERMISSION_HELPER "${K3B_ENABLE_PERMISSION_HELPER}") - if(IS_ABSOLUTE ${KDE_INSTALL_DATADIR}) - set(K3B_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/k3b) -Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt + if(IS_ABSOLUTE ${DATA_INSTALL_DIR}) + set(K3B_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/k3b) +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/INSTALL.txt -+++ k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt -@@ -44,6 +44,7 @@ For debug: +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/INSTALL.txt 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/INSTALL.txt 2022-02-26 08:11:04.551478263 +0100 +@@ -42,6 +42,7 @@ -DKDE_INSTALL_LIBEXECDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DK3B_BUILD_API_DOCS=ON \ @@ -47,7 +47,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt -DK3B_DEBUG=ON dynamic analyzer and fuzzer: -@@ -56,6 +57,7 @@ For debug: +@@ -54,6 +55,7 @@ -DKDE_INSTALL_LIBEXECDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DK3B_BUILD_API_DOCS=ON \ @@ -55,10 +55,10 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/INSTALL.txt -DK3B_DEBUG=ON If the cmake run was successful you are presented with a list of configure results that shows -Index: k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/config-k3b.h.cmake =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/config-k3b.h.cmake -+++ k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/config-k3b.h.cmake 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/config-k3b.h.cmake 2022-02-26 08:11:04.551478263 +0100 @@ -20,6 +20,8 @@ #cmakedefine ENABLE_AUDIO_PLAYER @@ -68,10 +68,10 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/config-k3b.h.cmake #cmakedefine HAVE_BYTESWAP_H #cmakedefine WORDS_BIGENDIAN -Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/CMakeLists.txt =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/CMakeLists.txt -+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/CMakeLists.txt 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/CMakeLists.txt 2022-02-26 08:11:04.551478263 +0100 @@ -1,5 +1,7 @@ -add_subdirectory( helper ) @@ -81,11 +81,11 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/CMakeLists.txt add_subdirectory( icons ) add_subdirectory( pics ) -Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bdevicewidget.cpp -+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp -@@ -55,7 +55,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bdevicewidget.cpp 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bdevicewidget.cpp 2022-02-26 08:11:04.551478263 +0100 +@@ -55,7 +55,9 @@ m_messageWidget = new KMessageWidget( this ); m_messageWidget->hide(); m_messageWidget->setWordWrap( true ); @@ -95,7 +95,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp // buttons // ------------------------------------------------ -@@ -92,7 +94,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De +@@ -92,7 +94,9 @@ // ------------------------------------------------ connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) ); connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) ); @@ -105,7 +105,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp // ------------------------------------------------ } -@@ -241,10 +245,16 @@ void K3b::DeviceWidget::updateDeviceList +@@ -241,10 +245,16 @@ if (!groupNames.contains(m_deviceGroup)) { QString messageText = i18n("In order to give K3b full access to the writer device the current user needs be added to a group %1.", m_deviceGroup); @@ -122,7 +122,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp m_messageWidget->animatedShow(); } } -@@ -253,6 +263,7 @@ void K3b::DeviceWidget::updateDeviceList +@@ -253,6 +263,7 @@ void K3b::DeviceWidget::addUserToGroup() { @@ -130,17 +130,17 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bdevicewidget.cpp QVariantMap args; args["groupName"] = m_deviceGroup; args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name); -@@ -276,4 +287,5 @@ void K3b::DeviceWidget::addUserToGroup() +@@ -276,4 +287,5 @@ } } ); job->start(); +#endif } -Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermissionmodel.cpp =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinpermissionmodel.cpp -+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermissionmodel.cpp -@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel:: +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinpermissionmodel.cpp 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinpermissionmodel.cpp 2022-02-26 08:11:04.551478263 +0100 +@@ -341,6 +341,7 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup ) { @@ -148,7 +148,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermis if( burningGroup != d->burningGroup ) { beginResetModel(); d->burningGroup = burningGroup; -@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurn +@@ -357,6 +358,7 @@ } endResetModel(); } @@ -156,11 +156,11 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinpermis } void ExternalBinPermissionModel::update() -Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.cpp =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.cpp -+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.cpp -@@ -109,7 +109,12 @@ K3b::ExternalBinWidget::ExternalBinWidge +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinwidget.cpp 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.cpp 2022-02-26 08:11:04.551478263 +0100 +@@ -109,7 +109,12 @@ // setup permissions tab // ------------------------------------------------------------ QWidget* permissionsTab = new QWidget( m_mainTabWidget ); @@ -173,7 +173,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget permissionsLabel->setWordWrap( true ); m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab ); m_permissionView = new QTreeView( permissionsTab ); -@@ -117,11 +122,15 @@ K3b::ExternalBinWidget::ExternalBinWidge +@@ -117,11 +122,15 @@ m_permissionView->setAllColumnsShowFocus( true ); m_permissionView->setRootIsDecorated( false ); m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents ); @@ -189,7 +189,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") ); -@@ -140,14 +149,17 @@ K3b::ExternalBinWidget::ExternalBinWidge +@@ -140,14 +149,17 @@ m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") ); @@ -207,7 +207,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget while (::group *g = ::getgrent()) { const QString groupName = QString::fromLocal8Bit(g->gr_name); if (groupName == "cdrom" || -@@ -157,6 +169,7 @@ K3b::ExternalBinWidget::ExternalBinWidge +@@ -157,6 +169,7 @@ } } ::endgrent(); @@ -215,7 +215,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget } -@@ -203,12 +216,15 @@ void K3b::ExternalBinWidget::saveSearchP +@@ -203,12 +216,15 @@ void K3b::ExternalBinWidget::slotPermissionModelChanged() { @@ -231,7 +231,7 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget KAuth::Action action("org.kde.k3b.updatepermissions"); action.setHelperId("org.kde.k3b"); action.setParentWidget(this); -@@ -250,6 +266,7 @@ void K3b::ExternalBinWidget::slotChangeP +@@ -250,6 +266,7 @@ } } ); job->start(); @@ -239,11 +239,11 @@ Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget } -Index: k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.h =================================================================== ---- k3b-19.11.70git.20221104T020145~62f96f82f.orig/src/option/k3bexternalbinwidget.h -+++ k3b-19.11.70git.20221104T020145~62f96f82f/src/option/k3bexternalbinwidget.h -@@ -57,7 +57,9 @@ namespace K3b { +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/option/k3bexternalbinwidget.h 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/option/k3bexternalbinwidget.h 2022-02-26 08:11:04.551478263 +0100 +@@ -57,7 +57,9 @@ QTreeView* m_permissionView; KEditListWidget* m_searchPathBox; diff --git a/0001-remove-unnecessary-and-incorrect-version-check.patch b/0001-remove-unnecessary-and-incorrect-version-check.patch new file mode 100644 index 0000000..0a57a76 --- /dev/null +++ b/0001-remove-unnecessary-and-incorrect-version-check.patch @@ -0,0 +1,30 @@ +From 4413fa36189008c776c04a4dc2150c5e1bd1ef15 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Fri, 21 Oct 2022 12:28:26 +0200 +Subject: [PATCH] remove unnecessary (and incorrect) version check + +k3b already depends on kf5.88, no point having code for older versions +--- + src/CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 09a59f3..20ced14 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -269,11 +269,7 @@ install( FILES k3b.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) + install( FILES k3bui.rc k3bdeviceui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/k3b ) + install( FILES org.kde.k3b.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) + +-if (${ECM_VERSION} STRGREATER "5.58.0") +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +-else() +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +-endif() ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/option/k3btheme.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) + + set( SHARED_MIME_INFO_MINIMUM_VERSION "0.23" ) + find_package( SharedMimeInfo REQUIRED ) +-- +2.38.1 + diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch index 9b795f6..cf5eddf 100644 --- a/Don-t-suggest-to-install-libburn.patch +++ b/Don-t-suggest-to-install-libburn.patch @@ -13,11 +13,11 @@ People who want to use cdrskin instead can still install it. src/k3bsystemproblemdialog.cpp | 6 ------ 1 file changed, 6 deletions(-) -Index: k3b-19.11.70git.20220916T165241~5c732af86/src/k3bsystemproblemdialog.cpp +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/src/k3bsystemproblemdialog.cpp =================================================================== ---- k3b-19.11.70git.20220916T165241~5c732af86.orig/src/k3bsystemproblemdialog.cpp -+++ k3b-19.11.70git.20220916T165241~5c732af86/src/k3bsystemproblemdialog.cpp -@@ -287,13 +287,6 @@ void K3b::SystemProblemDialog::checkSyst +--- k3b-19.11.70git.20220224T154741~d20c6fb5f.orig/src/k3bsystemproblemdialog.cpp 2022-02-24 16:47:41.000000000 +0100 ++++ k3b-19.11.70git.20220224T154741~d20c6fb5f/src/k3bsystemproblemdialog.cpp 2022-02-26 08:10:54.275445434 +0100 +@@ -285,13 +285,6 @@ #endif } diff --git a/k3b-22.08.3.tar.xz b/k3b-22.08.3.tar.xz new file mode 100644 index 0000000..088844d --- /dev/null +++ b/k3b-22.08.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:893ec15e05376e8cd90b4168b8698c18d8639d9f503ad0fff09ed4c84338e398 +size 10764540 diff --git a/k3b-22.08.3.tar.xz.sig b/k3b-22.08.3.tar.xz.sig new file mode 100644 index 0000000..0ad9327 --- /dev/null +++ b/k3b-22.08.3.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmNgYyYACgkQu0YzUNbv +Me/NUA/+OczphDNpKEIboB7J/yC2kpx7Z5Kd2QNCUNnYAIr14qawmhWmLm6LUcXR +2bIMGLZpXKCBKJZ00mLT1Qbc7ZseLeL32PkPOPD0wEl4LJ5mesSo/NpjUnAOTibz +Y9H2P5sutzzO7Vs1uDLd1TT3Xk5sy6g9//os8sASqVdSQVz+D1t8UR1qldb4EV3X +VqKeyPdNawcz1IjoIg3zJ7tyNWAi7PkDYywrk3cXTP7AS3xPbE+RyiPKA0ltt7VP +OPyRsYa95zCoom3Q+PJ2KqFWzg/3/pTzzXBRa/SlRU+/qmyvGW4yRz/cM9tpP3Fd +1xHSseDrJLl9CGFwzGlFaaqazc/iP2ZGgtOKymZUenEiZV0qXlkmUqaXyi0KwWM+ +oWaU8hXGjAExmt27gN/bZnXbtxLtGX46r3xGfsUN/XUyBmT9/XPNy1WCVOOKnJWj +4jB05CxXKUJlp6CUUYV9PG3I1IvzZbOP5vDzymcEjASkfHrUcWQT/EGdhnds3uez +YUrxIK7x2sUcf9ulBiY3hIf53jQ3gW7rwg6qafPdZK1hqRSLN6PiQ4pr7CzhJHpo +sEufGg+C1o24VWlTr6Nn75qWawGbx1OQtwUqSRdVLCn5bOF6YDW5g6OY6PciC0b7 +8ZkmrgnGBwL1s+sMl7u7rCKNvtjKNlO+Jpn7khxa+eU5UPQL4ns= +=Uti7 +-----END PGP SIGNATURE----- diff --git a/k3b-22.11.80.tar.xz b/k3b-22.11.80.tar.xz deleted file mode 100644 index d80ff7a..0000000 --- a/k3b-22.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71e29d5b2d4a859d41c5980ee70d203f03c93e70b281d866ed92924dbce93a90 -size 10945832 diff --git a/k3b-22.11.80.tar.xz.sig b/k3b-22.11.80.tar.xz.sig deleted file mode 100644 index c116911..0000000 --- a/k3b-22.11.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmNtkcIACgkQOmpNuDnq -ptdrVA/9HwpOCqb3K3TiGncnP5H0yeScefqwpYF0Vfx2+ftJcWUpe+DhlbvLo338 -g89LpGF1BJ1skpofrvislJGGCjDJbCj/sxcu3qwY1CzfgHvnhFvoITMeo+9A+7Xu -cL+lb9/Q9zPJSfb4NMO5yp7AtlOam5k5fFeG//e+x7+UKlXdpkUSYdat/dHxeIh8 -8jxdhFziC/M6fpd5D5QIqDegoQlwAf6ddEOD2XvcJXnWxPSwIWxrUXd/jSbfD/cQ -Qtalq6EZQHuMCOIX1FnM5bv/npj4NKESLdtP8PQJe4aT8HjrMtQi5eE/VcqVyR5n -ZuS2eDAdkqbySGHMmuFt2U/oIdnSGx9HXK5O/DKU0es4oBeXnB77+tI4vNwTstSE -b8x5X1rUuP7EbFjIVxM5Rt1HyN4LG5l/CzU8F8AFH55YQQQYGtxRHRSTppAhz+Sa -lyj5WYG8O4NMigs7o88OUAZszxEImQ61oqVPzAucWH8FeLNHlj3V7+Ar2BHbGCIC -7PEk3d0pAtfauu4d9rvunWKUeWX3TC75hk1qWIx3CgojYJeTYSqMDy6/yBOSfXGg -uNL0ENrg612iHjKJlOTATkRXC8jH9q+fvgqPbziduIENvmnEtGJBzmFsAf0fSdPZ -5PcvlRB/7SBrVBl9PMeCt1UxU1buNB4ZNX2O/eqBVNJ+O3iZ+OI= -=24gW ------END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index 518e562..df0c442 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Sat Nov 12 08:53:36 UTC 2022 - Christophe Giboudeaux +Wed Nov 23 16:33:08 UTC 2022 - Christophe Giboudeaux -- Update to 22.11.80 - * New feature release +- Add patch to fix knewstuff install location: + * 0001-remove-unnecessary-and-incorrect-version-check.patch ------------------------------------------------------------------- Tue Nov 1 11:19:57 UTC 2022 - Christophe Giboudeaux diff --git a/k3b.spec b/k3b.spec index cfff4fd..7be9000 100644 --- a/k3b.spec +++ b/k3b.spec @@ -21,20 +21,23 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 22.11.80 +Version: 22.08.3 Release: 0 Summary: CD/DVD/Blu-ray Burning Application by KDE License: GPL-2.0-or-later +Group: Productivity/Multimedia/CD/Record URL: https://apps.kde.org/k3b -Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE -Patch1: Don-t-suggest-to-install-libburn.patch +Patch0: Don-t-suggest-to-install-libburn.patch # PATCH-FIX-OPENSUSE -Patch2: 0001-Revert-Enable-the-k3b-helper-by-default.patch +Patch1: 0001-Revert-Enable-the-k3b-helper-by-default.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-remove-unnecessary-and-incorrect-version-check.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: flac-devel @@ -106,6 +109,7 @@ complicated tasks such as audiovisual encoding and decoding. %package devel Summary: Development files for k3b +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel @@ -123,9 +127,10 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %install %kf5_makeinstall -C build - -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} +%if %{with released} + %find_lang %{name} --with-man --all-name + %{kf5_find_htmldocs} +%endif %suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning @@ -137,6 +142,7 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %files %license LICENSES/* %doc ChangeLog FAQ.txt PERMISSIONS.txt README.txt +%{_kf5_knsrcfilesdir}/k3btheme.knsrc %dir %{_kf5_plugindir}/k3b_plugins/ %dir %{_kf5_plugindir}/k3b_plugins/kcms %dir %{_kf5_plugindir}/kf5/ @@ -153,7 +159,6 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %{_kf5_bindir}/k3b %{_kf5_iconsdir}/hicolor/*/apps/k3b.* %{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-k3b.* -%{_kf5_knsrcfilesdir}/k3btheme.knsrc %{_kf5_kxmlguidir}/k3b %{_kf5_libdir}/libk3bdevice.so.* %{_kf5_libdir}/libk3blib.so.* @@ -173,6 +178,8 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %{_kf5_libdir}/libk3bdevice.so %{_kf5_libdir}/libk3blib.so +%if %{with released} %files lang -f %{name}.lang +%endif %changelog