Accepting request 1150868 from KDE:Applications
KDE release gear 24.02.0 OBS-URL: https://build.opensuse.org/request/show/1150868 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=156
This commit is contained in:
commit
b0270ae1be
@ -15,11 +15,11 @@ This reverts commit cb4985b00dc2d1a1e27850dcd672093426aafd8b.
|
||||
src/option/k3bexternalbinwidget.h | 2 ++
|
||||
8 files changed, 42 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/CMakeLists.txt
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/CMakeLists.txt
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/CMakeLists.txt
|
||||
@@ -36,6 +36,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support f
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0eb74a0..39a0624 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -36,6 +36,7 @@ option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks
|
||||
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)
|
||||
@ -27,7 +27,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/CMakeLists.txt
|
||||
|
||||
# plugin options
|
||||
option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
|
||||
@@ -287,6 +288,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B
|
||||
@@ -287,6 +288,7 @@ set(BUILD_EXTERNAL_ENCODER_PLUGIN "${K3B_BUILD_EXTERNAL_ENCODER_PLUGIN}")
|
||||
|
||||
set(ENABLE_HAL_SUPPORT "${K3B_ENABLE_HAL_SUPPORT}")
|
||||
set(ENABLE_AUDIO_PLAYER "${QT_QTMULTIMEDIA_FOUND}")
|
||||
@ -35,10 +35,10 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/CMakeLists.txt
|
||||
|
||||
if(IS_ABSOLUTE ${KDE_INSTALL_DATADIR})
|
||||
set(K3B_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/k3b)
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/INSTALL.txt
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/INSTALL.txt
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/INSTALL.txt
|
||||
diff --git a/INSTALL.txt b/INSTALL.txt
|
||||
index 9cd107d..f1ae322 100644
|
||||
--- a/INSTALL.txt
|
||||
+++ b/INSTALL.txt
|
||||
@@ -44,6 +44,7 @@ For debug:
|
||||
-DKDE_INSTALL_LIBEXECDIR=lib \
|
||||
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
|
||||
@ -55,10 +55,10 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/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.20230721T020132~9035e34b0/config-k3b.h.cmake
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/config-k3b.h.cmake
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/config-k3b.h.cmake
|
||||
diff --git a/config-k3b.h.cmake b/config-k3b.h.cmake
|
||||
index 1ef4180..0c7a1a1 100644
|
||||
--- a/config-k3b.h.cmake
|
||||
+++ b/config-k3b.h.cmake
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#cmakedefine ENABLE_AUDIO_PLAYER
|
||||
@ -68,10 +68,10 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/config-k3b.h.cmake
|
||||
#cmakedefine HAVE_BYTESWAP_H
|
||||
|
||||
#cmakedefine WORDS_BIGENDIAN
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/CMakeLists.txt
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/CMakeLists.txt
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index c2a0ac3..81962d4 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
|
||||
-add_subdirectory( helper )
|
||||
@ -81,11 +81,11 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/CMakeLists.txt
|
||||
|
||||
add_subdirectory( icons )
|
||||
add_subdirectory( pics )
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bdevicewidget.cpp
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
@@ -50,7 +50,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
|
||||
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
|
||||
index 4108ba3..9445517 100644
|
||||
--- a/src/option/k3bdevicewidget.cpp
|
||||
+++ b/src/option/k3bdevicewidget.cpp
|
||||
@@ -50,7 +50,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
|
||||
m_messageWidget = new KMessageWidget( this );
|
||||
m_messageWidget->hide();
|
||||
m_messageWidget->setWordWrap( true );
|
||||
@ -95,7 +95,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
|
||||
// buttons
|
||||
// ------------------------------------------------
|
||||
@@ -87,7 +89,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::De
|
||||
@@ -87,7 +89,9 @@ K3b::DeviceWidget::DeviceWidget( K3b::Device::DeviceManager* manager, QWidget *p
|
||||
// ------------------------------------------------
|
||||
connect( buttonRefreshDevices, SIGNAL(clicked()), SIGNAL(refreshButtonClicked()) );
|
||||
connect( m_deviceManager, SIGNAL(changed()), SLOT(init()) );
|
||||
@ -105,7 +105,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
// ------------------------------------------------
|
||||
}
|
||||
|
||||
@@ -236,10 +240,16 @@ void K3b::DeviceWidget::updateDeviceList
|
||||
@@ -236,10 +240,16 @@ void K3b::DeviceWidget::updateDeviceListViews()
|
||||
|
||||
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 <em>%1</em>.", m_deviceGroup);
|
||||
@ -122,7 +122,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
m_messageWidget->animatedShow();
|
||||
}
|
||||
}
|
||||
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceList
|
||||
@@ -248,6 +258,7 @@ void K3b::DeviceWidget::updateDeviceListViews()
|
||||
|
||||
void K3b::DeviceWidget::addUserToGroup()
|
||||
{
|
||||
@ -130,7 +130,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
QVariantMap args;
|
||||
args["groupName"] = m_deviceGroup;
|
||||
args["userName"] = QString::fromLocal8Bit(getpwuid(getuid())->pw_name);
|
||||
@@ -271,6 +282,7 @@ void K3b::DeviceWidget::addUserToGroup()
|
||||
@@ -275,6 +286,7 @@ void K3b::DeviceWidget::addUserToGroup()
|
||||
}
|
||||
} );
|
||||
job->start();
|
||||
@ -138,11 +138,11 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bdevicewidget.cpp
|
||||
}
|
||||
|
||||
#include "moc_k3bdevicewidget.cpp"
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::
|
||||
diff --git a/src/option/k3bexternalbinpermissionmodel.cpp b/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
index c3e24d0..2f64497 100644
|
||||
--- a/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
+++ b/src/option/k3bexternalbinpermissionmodel.cpp
|
||||
@@ -341,6 +341,7 @@ QModelIndex ExternalBinPermissionModel::buddy( const QModelIndex& index ) const
|
||||
|
||||
void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
|
||||
{
|
||||
@ -150,7 +150,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermis
|
||||
if( burningGroup != d->burningGroup ) {
|
||||
beginResetModel();
|
||||
d->burningGroup = burningGroup;
|
||||
@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurn
|
||||
@@ -357,6 +358,7 @@ void ExternalBinPermissionModel::setBurningGroup( const QString& burningGroup )
|
||||
}
|
||||
endResetModel();
|
||||
}
|
||||
@ -158,11 +158,11 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinpermis
|
||||
}
|
||||
|
||||
void ExternalBinPermissionModel::update()
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.cpp
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinwidget.cpp
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.cpp
|
||||
@@ -104,7 +104,12 @@ K3b::ExternalBinWidget::ExternalBinWidge
|
||||
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
|
||||
index e029226..0f6cc28 100644
|
||||
--- a/src/option/k3bexternalbinwidget.cpp
|
||||
+++ b/src/option/k3bexternalbinwidget.cpp
|
||||
@@ -104,7 +104,12 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
|
||||
// setup permissions tab
|
||||
// ------------------------------------------------------------
|
||||
QWidget* permissionsTab = new QWidget( m_mainTabWidget );
|
||||
@ -175,7 +175,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
permissionsLabel->setWordWrap( true );
|
||||
m_permissionModel = new ExternalBinPermissionModel( *manager, permissionsTab );
|
||||
m_permissionView = new QTreeView( permissionsTab );
|
||||
@@ -112,11 +117,15 @@ K3b::ExternalBinWidget::ExternalBinWidge
|
||||
@@ -112,11 +117,15 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
|
||||
m_permissionView->setAllColumnsShowFocus( true );
|
||||
m_permissionView->setRootIsDecorated( false );
|
||||
m_permissionView->header()->setSectionResizeMode( ExternalBinPermissionModel::ProgramColumn, QHeaderView::ResizeToContents );
|
||||
@ -191,7 +191,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
m_mainTabWidget->addTab( permissionsTab, i18n("Permissions") );
|
||||
|
||||
|
||||
@@ -135,9 +144,11 @@ K3b::ExternalBinWidget::ExternalBinWidge
|
||||
@@ -135,9 +144,11 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
|
||||
|
||||
m_mainTabWidget->addTab( searchPathTab, i18n("Search Path") );
|
||||
|
||||
@ -203,7 +203,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
connect( m_rescanButton, SIGNAL(clicked(bool)), this, SLOT(rescan()) );
|
||||
|
||||
qRegisterMetaType<HelperProgramItem>();
|
||||
@@ -145,6 +156,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
|
||||
@@ -145,6 +156,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
|
||||
qRegisterMetaTypeStreamOperators<HelperProgramItem>("K3b::HelperProgramItem");
|
||||
#endif
|
||||
|
||||
@ -211,7 +211,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
while (::group *g = ::getgrent()) {
|
||||
const QString groupName = QString::fromLocal8Bit(g->gr_name);
|
||||
if (groupName == "cdrom" ||
|
||||
@@ -154,6 +166,7 @@ K3b::ExternalBinWidget::ExternalBinWidge
|
||||
@@ -154,6 +166,7 @@ K3b::ExternalBinWidget::ExternalBinWidget( K3b::ExternalBinManager* manager, QWi
|
||||
}
|
||||
}
|
||||
::endgrent();
|
||||
@ -219,7 +219,7 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
}
|
||||
|
||||
|
||||
@@ -200,12 +213,15 @@ void K3b::ExternalBinWidget::saveSearchP
|
||||
@@ -200,12 +213,15 @@ void K3b::ExternalBinWidget::saveSearchPath()
|
||||
|
||||
void K3b::ExternalBinWidget::slotPermissionModelChanged()
|
||||
{
|
||||
@ -234,8 +234,8 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
+#ifdef ENABLE_PERMISSION_HELPER
|
||||
KAuth::Action action("org.kde.k3b.updatepermissions");
|
||||
action.setHelperId("org.kde.k3b");
|
||||
action.setParentWidget(this);
|
||||
@@ -247,6 +263,7 @@ void K3b::ExternalBinWidget::slotChangeP
|
||||
|
||||
@@ -252,6 +268,7 @@ void K3b::ExternalBinWidget::slotChangePermissions()
|
||||
}
|
||||
} );
|
||||
job->start();
|
||||
@ -243,10 +243,10 @@ Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget
|
||||
}
|
||||
|
||||
#include "moc_k3bexternalbinwidget.cpp"
|
||||
Index: k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.h
|
||||
===================================================================
|
||||
--- k3b-19.11.70git.20230721T020132~9035e34b0.orig/src/option/k3bexternalbinwidget.h
|
||||
+++ k3b-19.11.70git.20230721T020132~9035e34b0/src/option/k3bexternalbinwidget.h
|
||||
diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h
|
||||
index dceaba8..9426412 100644
|
||||
--- a/src/option/k3bexternalbinwidget.h
|
||||
+++ b/src/option/k3bexternalbinwidget.h
|
||||
@@ -57,7 +57,9 @@ namespace K3b {
|
||||
QTreeView* m_permissionView;
|
||||
KEditListWidget* m_searchPathBox;
|
||||
|
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30eb87c5bde8bffa2059efb609e18d08978713340d0c2c0664035378a5d9cb24
|
||||
size 10967652
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7xUACgkQu0YzUNbv
|
||||
Me/gOA/+MUB0N6Hw81bINKNwPQq1tXSg0jPRGIwZnl+EnlHfckm1wMAvyyzmWolp
|
||||
lfZCE8MqgzCUv+edyhkblaFfTTq8+pEPniUbHsIgK4bO7vCZbQj8bbpB5mRyQc5c
|
||||
Zp5V6iqpcVVB6I0NTc8tz5dExBQIQNBxR3bRiPtBgb6g5jS8dXl7fnpap7kO+LpE
|
||||
TujeXssABdxEuk5D3XChFje1XCWLdqlKzyjfnBbuNYU+z/2Eo2wT4uPucuNnKaAj
|
||||
7xcurVTd4+DNR7wHQDtjP8+qNW2YCETgUjWo/YO3eDAgsWDP6iGhRSb2Lw26nYPi
|
||||
vgHp3i49q/ZyXhDH8QejJYpgZ4TLaX2cG5yAp2CTuw8YSKCVdUz0rxU5OL230PE6
|
||||
VK6SxQ5xyyIAzLDheY22xVcXR5gr7WCTy3VA1NjLRcHF+OpuYB6GUzjDfBet55+q
|
||||
CbO2mBUaw2MkB4/KxzNVXyqEhtdVL21VkTHHKjmNP/MelOcGEnxtuwse3ng6ef9d
|
||||
hTe/8RyxXM8DSzQJ0weRi4r8qpKCEx8ifE6/2mzhRTqVtLMUmnErspcR+c3RXA37
|
||||
K1HdlTDcFVvb8ysW/gsXFR5jrYLgacPzkeoHRFpUrN+IX0i1JA99Gzf+fzyyN8Y2
|
||||
23T0CgrEsb7H8ams2ye+SYD47dt8Ku2uxr4uOa0WSjEjsgPvtgU=
|
||||
=NLXb
|
||||
-----END PGP SIGNATURE-----
|
3
k3b-24.02.0.tar.xz
Normal file
3
k3b-24.02.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2f24a5c7ce29b3abbcf14aaee924762356dcf0f5eac0051f83a92def9bf7b51c
|
||||
size 10967672
|
16
k3b-24.02.0.tar.xz.sig
Normal file
16
k3b-24.02.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrE4ACgkQu0YzUNbv
|
||||
Me/aVBAAj38llX8RsoOmnUJS1TcEWdI0Ba2O43+KM8dXloFj6h0MVOT34cppsNcK
|
||||
OFJUbblu1+Pms8gkhQzwnjJ62j3T0+i7Bax+zsMNhrd3B5JaSAhRPWy9cnIOhVHO
|
||||
xIDAQV7jTHORnaCvJ8p36Gtd1OtZ7TytYoMN9OQrmcxztblb8qfQo0Fc4SrMAYIX
|
||||
MMSAlHzGzymtdOVtRGXEzXrq0cASqa9cgwhtf9Swj1U/5tP3/9oHqGMHaWUbYM43
|
||||
Rk8YLBiYeG17obdB8BqD4kYF0wCqcm1s7W83e6vyBpISNbjcOc90qKHU8pSjnBNZ
|
||||
frjfYtIaSz61wsupGjlYmnE65/TPl6jg9FzlZprVVukvjXWsMjlSjl+oHcmSvE8X
|
||||
yM0RDijVGg/8EqqxwyEkG1+epTHooCytTnjl1DuhmkA6WaoaslVF6g3Ycq4a1pWg
|
||||
5vDygNFYCakcrGgdJgXqtSNmxLLKhPU01j9WiE08pdJB8zsjxjbLUeY/yKvvo50b
|
||||
Tj5IdkQk3M7l70t+ViOn6Rj18sPf/ipzk8EEAQtNbAlEbLMM9Gl0OG3ZN6/qBniO
|
||||
7/QjqfOakRMGZjENoT29ZiNHU8DEd8gNljo5XDvZIjN74jd5hNL4F5gRKS2hU32k
|
||||
T6tef74PUCVKeEP4lTL5DssLlOJ5fwc1lt1C0/T5esR10eJJvlA=
|
||||
=wjTy
|
||||
-----END PGP SIGNATURE-----
|
14
k3b.changes
14
k3b.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 23 13:58:30 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 24.02.0
|
||||
* New feature release
|
||||
- No code change since 24.01.95
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 9 16:07:36 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 24.01.95
|
||||
* https://kde.org/announcements/megarelease/6/rc2/
|
||||
- Rebase 0001-Revert-Enable-the-k3b-helper-by-default.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 5 14:19:08 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
164
k3b.spec
164
k3b.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package k3b
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,75 +16,75 @@
|
||||
#
|
||||
|
||||
|
||||
%define kf6_version 5.246.0
|
||||
%define qt6_version 6.6.0
|
||||
|
||||
%bcond_without released
|
||||
%bcond_without ffmpeg
|
||||
%bcond_without lame
|
||||
%bcond_without mad
|
||||
Name: k3b
|
||||
Version: 23.08.4
|
||||
Version: 24.02.0
|
||||
Release: 0
|
||||
Summary: CD/DVD/Blu-ray Burning Application by KDE
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://apps.kde.org/k3b
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: %{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: Don-t-suggest-to-install-libburn.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Revert-Enable-the-k3b-helper-by-default.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: libdvdread-devel
|
||||
BuildRequires: libsamplerate-devel
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: libmusicbrainz-devel
|
||||
BuildRequires: musepack-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(KF5Archive)
|
||||
BuildRequires: cmake(KF5Cddb)
|
||||
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(KF5NewStuff)
|
||||
BuildRequires: cmake(KF5Notifications)
|
||||
BuildRequires: cmake(KF5NotifyConfig)
|
||||
BuildRequires: cmake(KF5Service)
|
||||
BuildRequires: cmake(KF5Solid)
|
||||
BuildRequires: cmake(KF5WidgetsAddons)
|
||||
BuildRequires: cmake(KF5XmlGui)
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5DBus)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
BuildRequires: cmake(KCddb6)
|
||||
BuildRequires: cmake(KF6Archive) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Auth) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Config) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6FileMetaData) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6IconThemes) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6KCMUtils) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6KIO) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6NewStuff) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Notifications) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6NotifyConfig) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Solid) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
|
||||
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6DBus) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
|
||||
%ifarch x86_64 aarch64 riscv64
|
||||
BuildRequires: cmake(Qt6WebEngineWidgets) >= %{qt6_version}
|
||||
%endif
|
||||
BuildRequires: pkgconfig(dvdread)
|
||||
BuildRequires: pkgconfig(flac)
|
||||
BuildRequires: pkgconfig(flac++)
|
||||
BuildRequires: pkgconfig(samplerate)
|
||||
BuildRequires: pkgconfig(sndfile)
|
||||
BuildRequires: pkgconfig(taglib)
|
||||
BuildRequires: pkgconfig(vorbis)
|
||||
Requires: %{_bindir}/cdrdao
|
||||
Requires: %{_bindir}/cdrecord
|
||||
Requires: %{_bindir}/mkisofs
|
||||
Requires: %{_bindir}/readcd
|
||||
Requires: dvd+rw-tools
|
||||
Requires: udisks2
|
||||
Requires(post): hicolor-icon-theme
|
||||
Requires(post): shared-mime-info
|
||||
Requires(postun): hicolor-icon-theme
|
||||
Requires(postun): shared-mime-info
|
||||
Recommends: %{_bindir}/normalize
|
||||
Recommends: %{_bindir}/sox
|
||||
Recommends: %{_bindir}/transcode
|
||||
Recommends: vcdimager
|
||||
Provides: kde4-k3b = 4.2.2.svn951754
|
||||
Obsoletes: k3b-codecs
|
||||
Obsoletes: kde4-k3b < 4.2.2.svn951754
|
||||
%if %{with ffmpeg}
|
||||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(libavformat)
|
||||
@ -107,7 +107,7 @@ complicated tasks such as audiovisual encoding and decoding.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for k3b
|
||||
Requires: %{name} = %{version}
|
||||
Requires: k3b = %{version}
|
||||
|
||||
%description devel
|
||||
This package contain files needed for development with k3b.
|
||||
@ -119,61 +119,59 @@ This package contain files needed for development with k3b.
|
||||
|
||||
%build
|
||||
CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
%cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
|
||||
%cmake_build
|
||||
%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
|
||||
|
||||
%kf6_build
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
%kf6_install
|
||||
|
||||
%find_lang %{name} --with-man --all-name
|
||||
%{kf5_find_htmldocs}
|
||||
%find_lang %{name} --with-html --all-name
|
||||
|
||||
%suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning
|
||||
|
||||
%fdupes -s %{buildroot}
|
||||
%fdupes %{buildroot}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSES/*
|
||||
%doc ChangeLog FAQ.txt PERMISSIONS.txt README.txt
|
||||
%dir %{_kf5_plugindir}/k3b_plugins/
|
||||
%dir %{_kf5_plugindir}/k3b_plugins/kcms
|
||||
%dir %{_kf5_plugindir}/kf5/
|
||||
%dir %{_kf5_plugindir}/kf5/kio/
|
||||
%dir %{_kf5_servicesdir}/ServiceMenus
|
||||
%dir %{_kf5_sharedir}/konqsidebartng
|
||||
%dir %{_kf5_sharedir}/konqsidebartng/virtual_folders
|
||||
%dir %{_kf5_sharedir}/konqsidebartng/virtual_folders/services
|
||||
%dir %{_kf5_sharedir}/solid
|
||||
%dir %{_kf5_sharedir}/solid/actions
|
||||
%doc %lang(en) %{_kf5_htmldir}/en/k3b/
|
||||
%{_kf5_applicationsdir}/org.kde.k3b.desktop
|
||||
%{_kf5_appstreamdir}/org.kde.k3b.appdata.xml
|
||||
%{_kf5_bindir}/k3b
|
||||
%{_kf5_debugdir}/k3b.categories
|
||||
%{_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.*
|
||||
%{_kf5_notifydir}/k3b.notifyrc
|
||||
%{_kf5_plugindir}/k3b_plugins/k3b*.so
|
||||
%{_kf5_plugindir}/k3b_plugins/kcms/kcm_k3b*.so
|
||||
%{_kf5_plugindir}/kf5/kio/videodvd.so
|
||||
%{_kf5_servicesdir}/ServiceMenus/k3b_*.desktop
|
||||
%{_kf5_servicetypesdir}/k3bplugin.desktop
|
||||
%{_kf5_sharedir}/k3b
|
||||
%{_kf5_sharedir}/konqsidebartng/virtual_folders/services/videodvd.desktop
|
||||
%{_kf5_sharedir}/mime/packages/x-k3b.xml
|
||||
%{_kf5_sharedir}/solid/actions/k3b_*.desktop
|
||||
%doc README.txt
|
||||
%doc %lang(en) %{_kf6_htmldir}/en/k3b/
|
||||
%{_kf6_applicationsdir}/org.kde.k3b.desktop
|
||||
%{_kf6_appstreamdir}/org.kde.k3b.appdata.xml
|
||||
%{_kf6_bindir}/k3b
|
||||
%{_kf6_debugdir}/k3b.categories
|
||||
%{_kf6_iconsdir}/hicolor/*/apps/k3b.*
|
||||
%{_kf6_iconsdir}/hicolor/*/mimetypes/application-x-k3b.*
|
||||
%{_kf6_knsrcfilesdir}/k3btheme.knsrc
|
||||
%{_kf6_libdir}/libk3bdevice.so.*
|
||||
%{_kf6_libdir}/libk3blib.so.*
|
||||
%{_kf6_notificationsdir}/k3b.notifyrc
|
||||
%{_kf6_plugindir}/k3b_plugins/
|
||||
%{_kf6_plugindir}/kf6/kio/videodvd.so
|
||||
%{_kf6_sharedir}/k3b/
|
||||
%dir %{_kf6_sharedir}/kio
|
||||
%dir %{_kf6_sharedir}/kio/servicemenus
|
||||
%{_kf6_sharedir}/kio/servicemenus/k3b_create_audio_cd.desktop
|
||||
%{_kf6_sharedir}/kio/servicemenus/k3b_create_data_project.desktop
|
||||
%{_kf6_sharedir}/kio/servicemenus/k3b_create_video_cd.desktop
|
||||
%{_kf6_sharedir}/kio/servicemenus/k3b_write_bin_image.desktop
|
||||
%{_kf6_sharedir}/kio/servicemenus/k3b_write_iso_image.desktop
|
||||
# No idea if that still works
|
||||
%dir %{_kf6_sharedir}/konqsidebartng
|
||||
%dir %{_kf6_sharedir}/konqsidebartng/virtual_folders
|
||||
%dir %{_kf6_sharedir}/konqsidebartng/virtual_folders/services
|
||||
%{_kf6_sharedir}/konqsidebartng/virtual_folders/services/videodvd.desktop
|
||||
%{_kf6_sharedir}/mime/packages/x-k3b.xml
|
||||
%dir %{_kf6_sharedir}/solid
|
||||
%dir %{_kf6_sharedir}/solid/actions
|
||||
%{_kf6_sharedir}/solid/actions/k3b_*.desktop
|
||||
|
||||
%files devel
|
||||
%{_includedir}/k3b*.h
|
||||
%{_kf5_libdir}/libk3bdevice.so
|
||||
%{_kf5_libdir}/libk3blib.so
|
||||
%{_kf6_libdir}/libk3bdevice.so
|
||||
%{_kf6_libdir}/libk3blib.so
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%exclude %{_kf6_htmldir}/en/k3b/
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user