Accepting request 855245 from KDE:Applications

KDE Applications 20.12.0 OBS-URL: https://build.opensuse.org/request/show/855245 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=116
2020-12-17 16:02:32 +00:00 · 2020-12-17 16:02:32 +00:00 · d8b31155c3
commit d8b31155c3
parent 87423da0c9
7 changed files with 69 additions and 265 deletions
--- a/Update-FindTaglib-from-ECM.patch
+++ b/Update-FindTaglib-from-ECM.patch
@ -1,247 +0,0 @@
-From f4c1c91d9b091941ebb4dae6aef95bcf9bc1c388 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 21 Jun 2020 14:19:49 +0200
-Subject: [PATCH] Update FindTaglib from ECM.
-
-This fixes linking for me, there was just nothing in TAGLIB_LIBRARIES
-on my system (taglib in the same custom prefix as KDE code)
---
- cmake/modules/FindTaglib.cmake     | 191 +++++++++++------------------
- plugins/mediaplayer/CMakeLists.txt |   3 +-
- 2 files changed, 74 insertions(+), 120 deletions(-)
-
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 13db60b2..1e1b9075 100644
--- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -1,135 +1,90 @@
-# - Try to find the Taglib library
-# Once done this will define
-+#.rst:
-+# FindTaglib
-+#-----------
- #
-#  TAGLIB_FOUND - system has the taglib library
-#  TAGLIB_CFLAGS - the taglib cflags
-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-+# Try to find the Taglib library.
- #
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if(NOT TAGLIB_MIN_VERSION)
-  set(TAGLIB_MIN_VERSION "1.6")
-endif()
-
-if(NOT WIN32)
-    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
-       ${BIN_INSTALL_DIR}
-    )
-endif()
-
-#reset vars
-set(TAGLIB_LIBRARIES)
-set(TAGLIB_CFLAGS)
-
-# if taglib-config has been found
-if(TAGLIBCONFIG_EXECUTABLE)
-
-  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
-
-  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-     set(TAGLIB_FOUND FALSE)
-  else()
-
-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
-
-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
-+# This will define the following variables:
-+#
-+# ``Taglib_FOUND``
-+#       True if the system has the taglib library of at least the minimum
-+#       version specified by the version parameter to find_package()
-+# ``Taglib_INCLUDE_DIRS``
-+#       The taglib include dirs for use with target_include_directories
-+# ``Taglib_LIBRARIES``
-+#       The taglib libraries for use with target_link_libraries()
-+# ``Taglib_VERSION``
-+#       The version of taglib that was found
-+#
-+# If ``Taglib_FOUND is TRUE, it will also define the following imported
-+# target:
-+#
-+# ``Taglib::Taglib``
-+#       The Taglib library
-+#
-+# Since 5.72.0
-+#
-+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
-+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
-+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
-+# SPDX-License-Identifier: BSD-3-Clause
- 
-     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-        set(TAGLIB_FOUND TRUE)
-     endif()
-     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-  endif() 
-  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
-+find_package(PkgConfig QUIET)
- 
-else()
-+pkg_search_module(PC_TAGLIB QUIET taglib)
- 
-  find_path(TAGLIB_INCLUDES
-    NAMES
-    tag.h
-+find_path(Taglib_INCLUDE_DIRS
-+    NAMES tag.h
-     PATH_SUFFIXES taglib
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    ${INCLUDE_INSTALL_DIR}
-  )
-
-    if(NOT WIN32)
-      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
-+    HINTS ${PC_TAGLIB_INCLUDEDIR}
-+)
- 
-      find_library(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-+find_library(Taglib_LIBRARIES
-+    NAMES tag
-+    HINTS ${PC_TAGLIB_LIBDIR}
-+)
- 
-    else()
-+set(Taglib_VERSION ${PC_TAGLIB_VERSION})
- 
-      # 1. get all possible libnames
-      set(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
-      set(newargs "")               
-      set(libnames_release "")      
-      set(libnames_debug "")        
-+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
-+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
-+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
- 
-      list(LENGTH args listCount)
-+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
-+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
- 
-        # just one name
-        list(APPEND libnames_release "tag")
-        list(APPEND libnames_debug   "tagd")
-
-        set(newargs ${args})
-
-      # search the release lib
-      find_library(TAGLIB_LIBRARIES_RELEASE
-                   NAMES ${libnames_release}
-                   ${newargs}
-      )
-
-      # search the debug lib
-      find_library(TAGLIB_LIBRARIES_DEBUG
-                   NAMES ${libnames_debug}
-                   ${newargs}
-      )
-
-      if(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
-
-        # both libs found
-        set(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
-                        debug     ${TAGLIB_LIBRARIES_DEBUG})
-
-      else()
-
-        if(TAGLIB_LIBRARIES_RELEASE)
-
-          # only release found
-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
-
-        else()
-
-          # only debug (or nothing) found
-          set(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
-
-        endif()
-
-      endif()
-
-      mark_as_advanced(TAGLIB_LIBRARIES_RELEASE)
-      mark_as_advanced(TAGLIB_LIBRARIES_DEBUG)
-+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
-+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
- 
-+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
-     endif()
-  
-  include(FindPackageMessage)
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
-
- endif()
- 
-
-if(TAGLIB_FOUND)
-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
-    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
-  endif()
-else()
-  if(Taglib_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find Taglib")
-  endif()
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Taglib
-+    FOUND_VAR
-+        Taglib_FOUND
-+    REQUIRED_VARS
-+        Taglib_LIBRARIES
-+        Taglib_INCLUDE_DIRS
-+    VERSION_VAR
-+        Taglib_VERSION
-+)
-+
-+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
-+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
-+    set_target_properties(Taglib::Taglib PROPERTIES
-+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
-+    )
- endif()
- 
-+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
-+
-+include(FeatureSummary)
-+set_package_properties(Taglib PROPERTIES
-+    URL "https://taglib.org/"
-+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
-+)
-diff --git a/plugins/mediaplayer/CMakeLists.txt b/plugins/mediaplayer/CMakeLists.txt
-index 8bbeeb74..5fbe056f 100644
--- a/plugins/mediaplayer/CMakeLists.txt
-+++ b/plugins/mediaplayer/CMakeLists.txt
-@@ -1,5 +1,4 @@
- find_package(Taglib REQUIRED)
-include_directories(${TAGLIB_INCLUDES})
- #find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaWidgets)
- #include_directories(${Qt5Multimedia_INCLUDE_DIRS})
- include_directories(${PHONON_INCLUDES})
-@@ -34,7 +33,7 @@ kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorrent_mediaplayer.desktop)
- target_link_libraries(
-     ktorrent_mediaplayer
-     ktcore
-    ${TAGLIB_LIBRARIES}
-+    Taglib::Taglib
-     Phonon::phonon4qt5
-     KF5::Torrent
-     KF5::I18n
-- 
-GitLab
-
--- a/applications.keyring
+++ b/applications.keyring
--- a/ktorrent-20.12.0.tar.xz
+++ b/ktorrent-20.12.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4b55c47ceea349e8cc248b74e27ae42c53cd48dc6bfcf416519c7bb5a399749
+size 2140524
--- a/ktorrent-20.12.0.tar.xz.sig
+++ b/ktorrent-20.12.0.tar.xz.sig
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/JhIYACgkQ29LOiT4t
+HIdmFQf+K29g5r4GtWkEaYXq3aUTdyWmv+GPtdbjHOJ+MyQPQdB3ajVOguD1mAnE
+gvIiIXfoMJszwXh6biN7Q8YNvBoQJ4Nhdwaj0SPLtKwIQpuvPItHpU1vjA9iUe4n
+XMhbbVfdozW8DRSCZQiPVn+Fyrnv3nOx6num+H8O3eFSNyuqokJ5jW8KZkexEiiz
+u8WEGpM6nVmrIJueNAkIuJLR9+qVXPY2HQJcDPwt4l/G5fEx2GlywOHicU2PxlxE
+OYo67AiTcE+m4lwhjYJl1SH7Tijc91YQp5rZ5UAxQeqR4trVrPoHHNfh7ohgWyey
+F2Udufiy/Qd/QdgluQL1j2KWYrN51g==
+=Dcs/
+-----END PGP SIGNATURE-----
--- a/ktorrent-5.2.0.tar.xz
+++ b/ktorrent-5.2.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1031d745c1ace02d11b59c426610aee779d208e3d1ae81f8559c265173732ff
-size 2056012
--- a/ktorrent.changes
+++ b/ktorrent.changes
@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sat Dec  5 23:17:18 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 20.12.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/2020-12-apps-update
+- No code change since 20.11.90
+
+-------------------------------------------------------------------
+Fri Nov 27 15:17:32 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.11.90
+  * New feature release
+- No code change since 20.11.80
+
+-------------------------------------------------------------------
+Sat Nov 14 09:33:21 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.11.80.
+  * New feature release
+- ktorrent is now released using the KDE release service.
+- Drop Update-FindTaglib-from-ECM.patch. No longer needed.
+
+-------------------------------------------------------------------
+Thu Aug 27 13:20:31 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Spec cleanup
+
 -------------------------------------------------------------------
 Sat Jul 11 13:51:11 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>

--- a/ktorrent.spec
+++ b/ktorrent.spec
@ -16,20 +16,25 @@
 #


+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
+%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%bcond_without lang
 Name:           ktorrent
-Version:        5.2.0
+Version:        20.12.0
 Release:        0
 Summary:        KDE BitTorrent Client
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/File-Sharing
 URL:            https://kde.org/applications/internet/org.kde.ktorrent/
-Source0:        https://download.kde.org/stable/ktorrent/%{version}/%{name}-%{version}.tar.xz
-Source2:        ktorrent.1
-Source3:        ktupnptest.1
+Source0:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
+Source3:        ktorrent.1
+Source4:        ktupnptest.1
 # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader
 Patch0:         initial-preference.diff
-# PATCH-FIX-UPSTREAM
-Patch1:         Update-FindTaglib-from-ECM.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  libboost_headers-devel
@ -57,13 +62,13 @@ BuildRequires:  cmake(KF5Plotting)
 BuildRequires:  cmake(KF5Solid)
 BuildRequires:  cmake(KF5Syndication)
 BuildRequires:  cmake(KF5TextWidgets)
-BuildRequires:  cmake(KF5Torrent) >= 2.2
+BuildRequires:  cmake(KF5Torrent)
 BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5WindowSystem)
 BuildRequires:  cmake(KF5XmlGui)
 BuildRequires:  cmake(LibKWorkspace)
 BuildRequires:  cmake(Phonon4Qt5)
-BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Core) >= 5.14
 BuildRequires:  cmake(Qt5DBus)
 BuildRequires:  cmake(Qt5Network)
 BuildRequires:  cmake(Qt5Script)
@ -83,31 +88,35 @@ for BitTorrent.
 %lang_package

 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1

 %build
 %cmake_kf5 -d build
-%make_jobs
+%cmake_build

 %install
 %kf5_makeinstall -C build

 # Add man pages from help2man edited.
 mkdir -p %{buildroot}%{_mandir}/man1
-cp -a %{SOURCE2} %{buildroot}%{_mandir}/man1
 cp -a %{SOURCE3} %{buildroot}%{_mandir}/man1
+cp -a %{SOURCE4} %{buildroot}%{_mandir}/man1

 # Fix any .py files with shebangs and wrong permissions.
 find %{buildroot} -name "*.py" -perm 0644 -exec grep -l '#!' {} + | \
 	xargs -rd'\n' chmod -f a+x

+# E: env-script-interpreter
+find %{buildroot}%{_kf5_sharedir}/ktorrent/scripts -name "*.py" -exec sed -i 's#env kf5kross#kf5kross#' {} \;
+
 %suse_update_desktop_file -r org.kde.ktorrent Qt KDE Network P2P

 %fdupes -s %{buildroot}

+%if %{with lang}
 %find_lang %{name}
-%kf5_find_htmldocs
+%{kf5_find_htmldocs}
+%endif

 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@ -115,11 +124,11 @@ find %{buildroot} -name "*.py" -perm 0644 -exec grep -l '#!' {} + | \
 %files
 %license COPYING
 %doc ChangeLog RoadMap
+%{_kf5_applicationsdir}/org.kde.ktorrent.desktop
+%{_kf5_appstreamdir}/org.kde.ktorrent.appdata.xml
 %{_kf5_bindir}/ktmagnetdownloader
 %{_kf5_bindir}/ktorrent
 %{_kf5_bindir}/ktupnptest
-%{_kf5_applicationsdir}/org.kde.ktorrent.desktop
-%{_kf5_appstreamdir}/org.kde.ktorrent.appdata.xml
 %{_kf5_htmldir}/en/ktorrent/
 %{_kf5_iconsdir}/hicolor/*/*/*.png
 %{_kf5_iconsdir}/hicolor/*/*/*.svgz
@ -131,6 +140,8 @@ find %{buildroot} -name "*.py" -perm 0644 -exec grep -l '#!' {} + | \
 %{_kf5_plugindir}/
 %{_kf5_sharedir}/ktorrent/

+%if %{with lang}
 %files lang -f %{name}.lang
+%endif

 %changelog