From 1cf7de6c347e3f4720dd02cfe7ff8fec333bf774ed872f92c77ab7f56e4bad60 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 29 Mar 2022 06:44:19 +0000 Subject: [PATCH 1/4] KDE Gear 21.04 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=192 --- ...ert-Enable-the-k3b-helper-by-default.patch | 105 +++++++++--------- Don-t-suggest-to-install-libburn.patch | 10 +- k3b-21.12.3.tar.xz | 3 - k3b-21.12.3.tar.xz.sig | 16 --- k3b-22.03.80.tar.xz | 3 + k3b-22.03.80.tar.xz.sig | 16 +++ k3b.changes | 13 +++ k3b.spec | 16 +-- 8 files changed, 96 insertions(+), 86 deletions(-) delete mode 100644 k3b-21.12.3.tar.xz delete mode 100644 k3b-21.12.3.tar.xz.sig create mode 100644 k3b-22.03.80.tar.xz create mode 100644 k3b-22.03.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 c226ccf..3532793 100644 --- a/0001-Revert-Enable-the-k3b-helper-by-default.patch +++ b/0001-Revert-Enable-the-k3b-helper-by-default.patch @@ -15,19 +15,19 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b. src/option/k3bexternalbinwidget.h | 2 ++ 8 files changed, 42 insertions(+), 1 deletion(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d3bd9827..fb8fe81e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,6 +34,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ 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) -@@ -270,6 +271,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B_BUILD_EXTERNAL_ENCODER_PLUGIN}") + 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}") @@ -35,11 +35,11 @@ index 5d3bd9827..fb8fe81e4 100644 if(IS_ABSOLUTE ${DATA_INSTALL_DIR}) set(K3B_DATA_INSTALL_DIR ${DATA_INSTALL_DIR}/k3b) -diff --git a/INSTALL.txt b/INSTALL.txt -index 9cd107ddd..f1ae3228d 100644 ---- a/INSTALL.txt -+++ b/INSTALL.txt -@@ -44,6 +44,7 @@ For debug: +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ -DKDE_INSTALL_LIBEXECDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DK3B_BUILD_API_DOCS=ON \ @@ -47,7 +47,7 @@ index 9cd107ddd..f1ae3228d 100644 -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 9cd107ddd..f1ae3228d 100644 -DK3B_DEBUG=ON If the cmake run was successful you are presented with a list of configure results that shows -diff --git a/config-k3b.h.cmake b/config-k3b.h.cmake -index f2a6fe20e..c9b41d0cf 100644 ---- a/config-k3b.h.cmake -+++ b/config-k3b.h.cmake +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 f2a6fe20e..c9b41d0cf 100644 #cmakedefine HAVE_BYTESWAP_H #cmakedefine WORDS_BIGENDIAN -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1a45e18d7..d9cd935b3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 1a45e18d7..d9cd935b3 100644 add_subdirectory( icons ) add_subdirectory( pics ) -diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp -index 6c2d6a0e8..42479bfbe 100644 ---- a/src/option/k3bdevicewidget.cpp -+++ b/src/option/k3bdevicewidget.cpp -@@ -57,7 +57,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ m_messageWidget = new KMessageWidget( this ); m_messageWidget->hide(); m_messageWidget->setWordWrap( true ); @@ -95,7 +95,7 @@ index 6c2d6a0e8..42479bfbe 100644 // buttons // ------------------------------------------------ -@@ -94,7 +96,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p +@@ -92,7 +94,9 @@ // ------------------------------------------------ connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) ); connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) ); @@ -105,7 +105,7 @@ index 6c2d6a0e8..42479bfbe 100644 // ------------------------------------------------ } -@@ -243,10 +247,16 @@ void K3b::DeviceWidget::updateDeviceListViews() +@@ -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 6c2d6a0e8..42479bfbe 100644 m_messageWidget->animatedShow(); } } -@@ -255,6 +265,7 @@ void K3b::DeviceWidget::updateDeviceListViews() +@@ -253,6 +263,7 @@ void K3b::DeviceWidget::addUserToGroup() { @@ -130,17 +130,17 @@ index 6c2d6a0e8..42479bfbe 100644 QVariantMap args; args["groupName"] = m_deviceGroup; args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name); -@@ -278,4 +289,5 @@ void K3b::DeviceWidget::addUserToGroup() +@@ -276,4 +287,5 @@ } } ); job->start(); +#endif } -diff --git a/src/option/k3bexternalbinpermissionmodel.cpp b/src/option/k3bexternalbinpermissionmodel.cpp -index 156c10d75..aed13e10c 100644 ---- a/src/option/k3bexternalbinpermissionmodel.cpp -+++ b/src/option/k3bexternalbinpermissionmodel.cpp -@@ -348,6 +348,7 @@ QModelIndex ExternalBinPermissionModel::buddy( const QModelIndex& index ) const +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup ) { @@ -148,7 +148,7 @@ index 156c10d75..aed13e10c 100644 if( burningGroup != d->burningGroup ) { beginResetModel(); d->burningGroup = burningGroup; -@@ -364,6 +365,7 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup ) +@@ -357,6 +358,7 @@ } endResetModel(); } @@ -156,11 +156,11 @@ index 156c10d75..aed13e10c 100644 } void ExternalBinPermissionModel::update() -diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp -index 10846b282..e90894213 100644 ---- a/src/option/k3bexternalbinwidget.cpp -+++ b/src/option/k3bexternalbinwidget.cpp -@@ -111,7 +111,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ // setup permissions tab // ------------------------------------------------------------ QWidget* permissionsTab = new QWidget( m_mainTabWidget ); @@ -173,7 +173,7 @@ index 10846b282..e90894213 100644 permissionsLabel->setWordWrap( true ); m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab ); m_permissionView = new QTreeView( permissionsTab ); -@@ -119,11 +124,15 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -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 10846b282..e90894213 100644 m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") ); -@@ -142,14 +151,17 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -140,14 +149,17 @@ m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") ); @@ -207,7 +207,7 @@ index 10846b282..e90894213 100644 while (::group *g = ::getgrent()) { const QString groupName = QString::fromLocal8Bit(g->gr_name); if (groupName == "cdrom" || -@@ -159,6 +171,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi +@@ -157,6 +169,7 @@ } } ::endgrent(); @@ -215,7 +215,7 @@ index 10846b282..e90894213 100644 } -@@ -205,12 +218,15 @@ void K3b::ExternalBinWidget::saveSearchPath() +@@ -203,12 +216,15 @@ void K3b::ExternalBinWidget::slotPermissionModelChanged() { @@ -231,7 +231,7 @@ index 10846b282..e90894213 100644 KAuth::Action action("org.kde.k3b.updatepermissions"); action.setHelperId("org.kde.k3b"); action.setParentWidget(this); -@@ -252,6 +268,7 @@ void K3b::ExternalBinWidget::slotChangePermissions() +@@ -250,6 +266,7 @@ } } ); job->start(); @@ -239,11 +239,11 @@ index 10846b282..e90894213 100644 } -diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h -index d1f1e74f9..ce4ec60ec 100644 ---- a/src/option/k3bexternalbinwidget.h -+++ b/src/option/k3bexternalbinwidget.h -@@ -66,7 +66,9 @@ namespace K3b { +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ QTreeView* m_permissionView; KEditListWidget* m_searchPathBox; @@ -253,6 +253,3 @@ index d1f1e74f9..ce4ec60ec 100644 QPushButton* m_rescanButton; }; } --- -2.21.0 - diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch index 397accc..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(-) -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 805e3354c..1abcb27c8 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -291,13 +291,6 @@ void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel le +Index: k3b-19.11.70git.20220224T154741~d20c6fb5f/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 @@ #endif } diff --git a/k3b-21.12.3.tar.xz b/k3b-21.12.3.tar.xz deleted file mode 100644 index 1d24594..0000000 --- a/k3b-21.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acdbf40e1bccff837c50ba0a9d5e83370c24bc759c51d61385429ac3bf59f845 -size 10750308 diff --git a/k3b-21.12.3.tar.xz.sig b/k3b-21.12.3.tar.xz.sig deleted file mode 100644 index 8bd572c..0000000 --- a/k3b-21.12.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZAAACgkQu0YzUNbv -Me8JhhAAliQ5JRzrNp3qa6IIu1ZmnRf1ihstiN96VJpA1uq/+pwEt2A0SRskxoUK -TkjDfXa2jJbzsm2ZbNPyc2VzsGkU7t61EhuYJVMyTK5hiJWOJUAzdY00g3B47/Y1 -H3ZYSnEHNeUpVhMl/SlSc/CUZig/Y2IlF8HuNCE+/eCHjqmL0+Oc/JOGVUxxjNN0 -NowWT4oQgmYg0ctNNdwZV7/ilDtifPEW2UkwvUiBQtzq4O1Ke71YnKd+IUmQ941k -4ZVuGxJOlvPv4cV2MKhSdpsc+cRmhEHpbPnEg1vOwGQOeBmkGFgQIvi0lFAqGMk6 -Gr5zdgxONMVUnipH9KDsdWb6dzN6g4TDbBgG6wBqS1DooOyshJ/nzP5ftZEqreP1 -pLkeKCh7gXv7Jx0EgooRvgxbgyZ8KdF5hvU8ON5bG5IG8a+U/5qhzvNEFh+6ExjW -PgaWq/YbDdioh9GaCo42hhmtnJipMAC95bLL6r+pALdvExm+9gX59khk2YDinGjf -jrv84kRiYEFpO28dS2d+6YEfSur7cPBj8h166NlPCX2IVrC/7YgDjvN+lLsuCtLs -xmbt6fs1La7Udri854K/7mrzTIYlJ1AnkxdqAyGoChdTrqHox0MxmlHfqcsTa89Q -bl0EA4BC1maU+mef4NhaNJhEE+DylwkdyCc+msqUZLqO7t0d71U= -=paYh ------END PGP SIGNATURE----- diff --git a/k3b-22.03.80.tar.xz b/k3b-22.03.80.tar.xz new file mode 100644 index 0000000..62ac54b --- /dev/null +++ b/k3b-22.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2e3f72bdb2e30666ac93bfc25514911afe6b603e3dc584ab0e30be5b44a313c +size 10739796 diff --git a/k3b-22.03.80.tar.xz.sig b/k3b-22.03.80.tar.xz.sig new file mode 100644 index 0000000..77ef4a8 --- /dev/null +++ b/k3b-22.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmI0jegACgkQOmpNuDnq +ptcy5w/+M4HehjOpFwO00yOBI0Jzfhe1nWL+odBHSg9LpySUTyoIToySKS8psjcT +Hk2F97sLqxFWUEuLx6K0Ofmp0LgwxuiOgl0GkyuweeGDorDalRZmrZAbXYwCERbx +wVGGh+iS+LJlLCadp9YVvzhjQu+TfyJaxvMX/xQjAIjJ+VKZVwURL8tGlaC6GyLR +VuuvSuhfPymd/8yZKwXz1dQglcAmhN5XWhB7a6QcNCASYskO+1q5qzoO6fJn9WyO +OcNxI0QqCl6buVsYrRa1X470P1Ux+R4N5hgyelQE7FnNF9Eapf7VCsgoCZJR0IIh +/9Al7KocMQk+IzY0X4DfeBxE8jxRNC2Id/KkfYg7AjJ8c4qLFwpvpnGrIDdOtPn9 +XvC76BUiGh4abmKG7o8/NhtmYAVuvLSCTMZHRPztoYzaHoxCFJGH/HHlmy6CP0J9 +5cAtP+Mvrf/ByhOlqLTP7EHF4vde9WWJiA22knUDlrM1r0aAd5Vqayup2zNnSaYN +zktajDI12bl3okUTykkpz3LsXbJT/cDXxBDVLyPDJ/jzVahR+TRHZbU1gq8v+uuq +nqBjxDztmsWCqwn8l/B6P/FCSEiJVTNl2O5ASKI/vQxuPJPWQ2Aon5iK2aSw48LC ++wpS8nHj0+jYNSw5NxJdjv9SH1iK4C9l3H8NEx/BR/Z4TVkSDFc= +=yDI6 +-----END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index 6c07a6a..ae18a95 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Mar 23 08:13:42 UTC 2022 - Christophe Giboudeaux + +- Update to 22.03.80 + * New feature release +- Changes since 21.12.3: + * Remove ffmpeg decoder plugin + * Eliminate duplication of character replacement in k3bpatternparser + * Fix path traversal in Album Artist field for CD ripping + * Add CI + * Replace GHNS button with KNS3 class + * Define X-KDE-ConfigModule for KCMs + ------------------------------------------------------------------- Tue Mar 1 09:56:45 UTC 2022 - Christophe Giboudeaux diff --git a/k3b.spec b/k3b.spec index c2a6396..d2c4bdc 100644 --- a/k3b.spec +++ b/k3b.spec @@ -21,15 +21,15 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 21.12.3 +Version: 22.03.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 @@ -141,6 +141,10 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSES/* %doc ChangeLog FAQ.txt PERMISSIONS.txt README.txt %{_kf5_knsrcfilesdir}/k3btheme.knsrc +%dir %{_kf5_plugindir}/k3b/ +%dir %{_kf5_plugindir}/k3b/kcms +%dir %{_kf5_plugindir}/kf5/ +%dir %{_kf5_plugindir}/kf5/kio/ %dir %{_kf5_servicesdir}/ServiceMenus %dir %{_kf5_sharedir}/konqsidebartng %dir %{_kf5_sharedir}/konqsidebartng/virtual_folders @@ -157,14 +161,10 @@ CXXFLAGS="%{optflags} -fno-strict-aliasing" %{_kf5_libdir}/libk3bdevice.so.* %{_kf5_libdir}/libk3blib.so.* %{_kf5_notifydir}/k3b.notifyrc -%dir %{_kf5_plugindir}/k3b/ %{_kf5_plugindir}/k3b/k3b*.so -%{_kf5_plugindir}/kcm_k3b*.so -%dir %{_kf5_plugindir}/kf5/ -%dir %{_kf5_plugindir}/kf5/kio/ +%{_kf5_plugindir}/k3b/kcms/kcm_k3b*.so %{_kf5_plugindir}/kf5/kio/videodvd.so %{_kf5_servicesdir}/ServiceMenus/k3b_*.desktop -%{_kf5_servicesdir}/kcm_k3b*.desktop %{_kf5_servicetypesdir}/k3bplugin.desktop %{_kf5_sharedir}/k3b %{_kf5_sharedir}/konqsidebartng/virtual_folders/services/videodvd.desktop From ad1048ea756198ee333a139c2ea069203c870f9e918221152f5d6f9c8b00da67 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 10 Apr 2022 10:41:24 +0000 Subject: [PATCH 2/4] KDE Gear 22.04 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=193 --- k3b-22.03.80.tar.xz | 3 --- k3b-22.03.80.tar.xz.sig | 16 ---------------- k3b-22.03.90.tar.xz | 3 +++ k3b-22.03.90.tar.xz.sig | 16 ++++++++++++++++ k3b.changes | 6 ++++++ k3b.spec | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 k3b-22.03.80.tar.xz delete mode 100644 k3b-22.03.80.tar.xz.sig create mode 100644 k3b-22.03.90.tar.xz create mode 100644 k3b-22.03.90.tar.xz.sig diff --git a/k3b-22.03.80.tar.xz b/k3b-22.03.80.tar.xz deleted file mode 100644 index 62ac54b..0000000 --- a/k3b-22.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2e3f72bdb2e30666ac93bfc25514911afe6b603e3dc584ab0e30be5b44a313c -size 10739796 diff --git a/k3b-22.03.80.tar.xz.sig b/k3b-22.03.80.tar.xz.sig deleted file mode 100644 index 77ef4a8..0000000 --- a/k3b-22.03.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmI0jegACgkQOmpNuDnq -ptcy5w/+M4HehjOpFwO00yOBI0Jzfhe1nWL+odBHSg9LpySUTyoIToySKS8psjcT -Hk2F97sLqxFWUEuLx6K0Ofmp0LgwxuiOgl0GkyuweeGDorDalRZmrZAbXYwCERbx -wVGGh+iS+LJlLCadp9YVvzhjQu+TfyJaxvMX/xQjAIjJ+VKZVwURL8tGlaC6GyLR -VuuvSuhfPymd/8yZKwXz1dQglcAmhN5XWhB7a6QcNCASYskO+1q5qzoO6fJn9WyO -OcNxI0QqCl6buVsYrRa1X470P1Ux+R4N5hgyelQE7FnNF9Eapf7VCsgoCZJR0IIh -/9Al7KocMQk+IzY0X4DfeBxE8jxRNC2Id/KkfYg7AjJ8c4qLFwpvpnGrIDdOtPn9 -XvC76BUiGh4abmKG7o8/NhtmYAVuvLSCTMZHRPztoYzaHoxCFJGH/HHlmy6CP0J9 -5cAtP+Mvrf/ByhOlqLTP7EHF4vde9WWJiA22knUDlrM1r0aAd5Vqayup2zNnSaYN -zktajDI12bl3okUTykkpz3LsXbJT/cDXxBDVLyPDJ/jzVahR+TRHZbU1gq8v+uuq -nqBjxDztmsWCqwn8l/B6P/FCSEiJVTNl2O5ASKI/vQxuPJPWQ2Aon5iK2aSw48LC -+wpS8nHj0+jYNSw5NxJdjv9SH1iK4C9l3H8NEx/BR/Z4TVkSDFc= -=yDI6 ------END PGP SIGNATURE----- diff --git a/k3b-22.03.90.tar.xz b/k3b-22.03.90.tar.xz new file mode 100644 index 0000000..3160697 --- /dev/null +++ b/k3b-22.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:570ffb671827c207d443c71761ac71f2c8f413a1a299244db4b351b01e28f397 +size 10743680 diff --git a/k3b-22.03.90.tar.xz.sig b/k3b-22.03.90.tar.xz.sig new file mode 100644 index 0000000..300b498 --- /dev/null +++ b/k3b-22.03.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJPuokACgkQu0YzUNbv +Me+/xQ//fj81XX3B2/qtFu54osooWhBHQ/KbZbpjBA/6FZK61WXCNTgZL5MewiI7 +WuhfVj0Xjau8a1GBglbG66FTpwnqlE0bGJAsw0UXUMXN5q6xWi3gmL7yrlX+6RpS +LXYLG8d8kU5HCmLPfw4D5/mCWjKWPV11ZWe5zcD5BVeeT3ytbNL401Ka6FNqj2Sk +j8ky8AMHJI8lPsc4HGApTyXfLyqC3Bp6YvDEI7p0e/cIY+7Ak0/q7xV7fbHnBijg +c6uZSW8z8N7Dh1P3KlV2Ch4uWnMl7mRmidCE4tDCMSHmjsjb2cNQ0gurT7OzAFYf +uPNuGKsikpP64ngqITJgDkt/ZJKmU7q7RLT4lpcvje/v9aISWoM8ZMvNh2p2PJau +z29zb5mTWi1LSzWAHTjrSUJuc5LQCp6l4Imqps4+6kAoJ+T/QV07csW/dBGxzrSk +/6NY9bqxJaFK2fTnPhLNB7p32rFBDuiLnlozbyY6KnEnwEWxR25QUD783Jw5QSxA +7sXU34HeqZKASft/CTh7mIsOKlmhaS4ccOZtIxeMEXeFXp7093ICTsJtrfp6lGBy +Ml2sF8Rk034X+rVHPIUY9mH/PmaE5ThEmIUYq7sYWycuBoyxl/LQws9Z41LzIQ4x +QCaHD2gMH1o9u3S5QynXLFkepZsdo2g95O+qLtLWOz1GLQ1JNWo= +=NkCg +-----END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index ae18a95..b894de4 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 8 18:17:37 UTC 2022 - Christophe Giboudeaux + +Update to 22.03.90 + * New feature release + ------------------------------------------------------------------- Wed Mar 23 08:13:42 UTC 2022 - Christophe Giboudeaux diff --git a/k3b.spec b/k3b.spec index d2c4bdc..e7872fc 100644 --- a/k3b.spec +++ b/k3b.spec @@ -21,7 +21,7 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 22.03.80 +Version: 22.03.90 Release: 0 Summary: CD/DVD/Blu-ray Burning Application by KDE License: GPL-2.0-or-later From 3793cfa4bd48ac808ff6d0cf057c27caaab5f7043b170ac4b97701b2a4ce82ac Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 10 Apr 2022 10:49:50 +0000 Subject: [PATCH 3/4] Add missing '- ' to changes OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=194 --- k3b.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k3b.changes b/k3b.changes index b894de4..e8ff62c 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Apr 8 18:17:37 UTC 2022 - Christophe Giboudeaux -Update to 22.03.90 +- Update to 22.03.90 * New feature release ------------------------------------------------------------------- From 137cc21d6245d488270d57d7c3f7ebc57b4b8ba826668a3bc60b0a8a4644c704 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 21 Apr 2022 08:20:54 +0000 Subject: [PATCH 4/4] Update to 22.04.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=195 --- k3b-22.03.90.tar.xz | 3 --- k3b-22.03.90.tar.xz.sig | 16 ---------------- k3b-22.04.0.tar.xz | 3 +++ k3b-22.04.0.tar.xz.sig | 16 ++++++++++++++++ k3b.changes | 8 ++++++++ k3b.spec | 6 +++--- 6 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 k3b-22.03.90.tar.xz delete mode 100644 k3b-22.03.90.tar.xz.sig create mode 100644 k3b-22.04.0.tar.xz create mode 100644 k3b-22.04.0.tar.xz.sig diff --git a/k3b-22.03.90.tar.xz b/k3b-22.03.90.tar.xz deleted file mode 100644 index 3160697..0000000 --- a/k3b-22.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:570ffb671827c207d443c71761ac71f2c8f413a1a299244db4b351b01e28f397 -size 10743680 diff --git a/k3b-22.03.90.tar.xz.sig b/k3b-22.03.90.tar.xz.sig deleted file mode 100644 index 300b498..0000000 --- a/k3b-22.03.90.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJPuokACgkQu0YzUNbv -Me+/xQ//fj81XX3B2/qtFu54osooWhBHQ/KbZbpjBA/6FZK61WXCNTgZL5MewiI7 -WuhfVj0Xjau8a1GBglbG66FTpwnqlE0bGJAsw0UXUMXN5q6xWi3gmL7yrlX+6RpS -LXYLG8d8kU5HCmLPfw4D5/mCWjKWPV11ZWe5zcD5BVeeT3ytbNL401Ka6FNqj2Sk -j8ky8AMHJI8lPsc4HGApTyXfLyqC3Bp6YvDEI7p0e/cIY+7Ak0/q7xV7fbHnBijg -c6uZSW8z8N7Dh1P3KlV2Ch4uWnMl7mRmidCE4tDCMSHmjsjb2cNQ0gurT7OzAFYf -uPNuGKsikpP64ngqITJgDkt/ZJKmU7q7RLT4lpcvje/v9aISWoM8ZMvNh2p2PJau -z29zb5mTWi1LSzWAHTjrSUJuc5LQCp6l4Imqps4+6kAoJ+T/QV07csW/dBGxzrSk -/6NY9bqxJaFK2fTnPhLNB7p32rFBDuiLnlozbyY6KnEnwEWxR25QUD783Jw5QSxA -7sXU34HeqZKASft/CTh7mIsOKlmhaS4ccOZtIxeMEXeFXp7093ICTsJtrfp6lGBy -Ml2sF8Rk034X+rVHPIUY9mH/PmaE5ThEmIUYq7sYWycuBoyxl/LQws9Z41LzIQ4x -QCaHD2gMH1o9u3S5QynXLFkepZsdo2g95O+qLtLWOz1GLQ1JNWo= -=NkCg ------END PGP SIGNATURE----- diff --git a/k3b-22.04.0.tar.xz b/k3b-22.04.0.tar.xz new file mode 100644 index 0000000..e250222 --- /dev/null +++ b/k3b-22.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504 +size 10745808 diff --git a/k3b-22.04.0.tar.xz.sig b/k3b-22.04.0.tar.xz.sig new file mode 100644 index 0000000..679cbba --- /dev/null +++ b/k3b-22.04.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJYuIAACgkQu0YzUNbv +Me9k0Q//WjE2pH/eEH4qcWReP3D1bZkArztbz9QjtCP9Ydeks45MOK1moAP5jt0K +726eUV/diV2g6GpYfILDJzTZ8UA6E91qwPLMJQjoCZkwcRMaJwsWdfAM+ItZzBHb +XSLgD3iLylZhAiCzVZEaux8Fro4dOgUxqpPJYd4EU1UWoaRRNfingfvI7jgYhW6w +ZZeKYnDjyqBlMwqSRlDS4a4YfEfu+7vaK6V6mRa3NKIZco1lJ4Wo6xpJKUisvh+X +z8YZdiWpJrDgyeA6brqTiIP0Fy8mTokIF3ZBVwElQ2uBPyrAIm7nUSRJsit+FPHU +2tDrpc/O01CB3f8TNzx4cAQjMMnec4B4QzJRDi7PiTe+xtV2/7IO6V1nLKcYW2vp +kl+ZG+/XTjBedTVKK/j8E6aVsJZ3/PZksCjSQn7h7M2OMzkWD6UH2Siw6MrTuGu4 +GIOhdDz6IgH69wxeAnf9x5FlFXstsi2KlUhgL/EG6uSGIf5iqZ7k18MNmeBtTeUj +n6EYR0wTz5Bya5PUTcm6JFuCJKBscl9+CDNB4Xjl3cOCIOk4jD8JaZeIWdUqJ7Mb +lOoF3HiyzWC+HnL54WRfCXsjCLKfhqe0wfEaJ7Itro/Hl/5rqxYjG6YzH+nuXVll +9+sC6v7N2BDSZQsXhMC4fkvshp2WC3Q2wEzNcRkWxZialzfJSIg= +=ClFx +-----END PGP SIGNATURE----- diff --git a/k3b.changes b/k3b.changes index e8ff62c..bfadbd3 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 18 07:51:09 UTC 2022 - Christophe Giboudeaux + +- Update to 22.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.04.0/ + ------------------------------------------------------------------- Fri Apr 8 18:17:37 UTC 2022 - Christophe Giboudeaux diff --git a/k3b.spec b/k3b.spec index e7872fc..e0075c6 100644 --- a/k3b.spec +++ b/k3b.spec @@ -21,15 +21,15 @@ %bcond_without lame %bcond_without mad Name: k3b -Version: 22.03.90 +Version: 22.04.0 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