Hello community,
here is the log from the commit of package kdevelop5 for openSUSE:Factory checked in at 2018-09-03 10:35:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdevelop5 (Old)
and /work/SRC/openSUSE:Factory/.kdevelop5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdevelop5"
Mon Sep 3 10:35:37 2018 rev:12 rq:632513 version:5.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdevelop5/kdevelop5.changes 2018-08-22 14:21:08.214463067 +0200
+++ /work/SRC/openSUSE:Factory/.kdevelop5.new/kdevelop5.changes 2018-09-03 10:35:39.356755134 +0200
@@ -1,0 +2,17 @@
+Fri Aug 31 12:37:01 UTC 2018 - Christophe Giboudeaux
+
+- Add requirements for kdevplatform-devel which are not detected
+ automatically.
+
+-------------------------------------------------------------------
+Fri Aug 31 11:24:13 UTC 2018 - Christophe Giboudeaux
+
+- Add kdevplatform-reduce-dependencies.diff to prevent adding
+ unneeded requirements to the kdevplatform-devel package.
+
+-------------------------------------------------------------------
+Wed Aug 29 07:48:48 UTC 2018 - Christophe Giboudeaux
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
kdevplatform-reduce-dependencies.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdevelop5.spec ++++++
--- /var/tmp/diff_new_pack.joJwpQ/_old 2018-09-03 10:35:39.964756705 +0200
+++ /var/tmp/diff_new_pack.joJwpQ/_new 2018-09-03 10:35:39.968756715 +0200
@@ -18,7 +18,6 @@
# for compatibility with Leap 42.3 which doesn't have this macro yet
%{!?_kf5_debugdir: %global _kf5_debugdir %{_kf5_configdir}}
-
%define rname kdevelop
%define rversion 5.2
%define libkdev_major 52
@@ -27,15 +26,12 @@
Version: 5.2.4
Release: 0
Summary: Plugin-extensible IDE for C/C++ and other programming languages
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Development/Tools/IDE
-Url: http://www.kdevelop.org
+URL: http://www.kdevelop.org
Source0: http://download.kde.org/stable/%{rname}/%{version}/src/%{rname}-%{version}.tar.xz
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
+# PATCH-FIX-UPSTREAM
+Patch0: kdevplatform-reduce-dependencies.diff
BuildRequires: grantlee5-devel
BuildRequires: karchive-devel
BuildRequires: kcmutils-devel
@@ -81,10 +77,10 @@
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
+Requires: kdevplatform = %{version}
Recommends: %{name}-lang
Recommends: cppcheck
Recommends: heaptrack-gui
-Requires: kdevplatform = %{version}
Conflicts: kdevelop4
Conflicts: kdevelop4-plugin-clang
# The following plugins were provided by the KDE repos providing unstable packages
@@ -97,7 +93,11 @@
Obsoletes: kdevelop5-plugin-qmake < %{version}
Provides: kdevelop5-plugin-cppsupport = %{version}
Obsoletes: kdevelop5-plugin-cppsupport < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_headers-devel
+%else
+BuildRequires: boost-devel
+%endif
%description
KDevelop is an integrated development environment (IDE).
@@ -110,10 +110,10 @@
%package -n kdevplatform
Summary: Base Package for Integrated Development Environments
Group: Development/Tools/IDE
-Conflicts: libkdevplatform4-devel
-Conflicts: kdevplatform4
Requires: libkdevplatform%{libkdev_major} = %{version}
Recommends: kdevplatform-lang
+Conflicts: kdevplatform4
+Conflicts: libkdevplatform4-devel
%description -n kdevplatform
This package contains the common plugins for integrated developments
@@ -132,8 +132,11 @@
%package -n kdevplatform-devel
Summary: Base Package for Integrated Development Environments: Build Environment
Group: Development/Tools/IDE
-Conflicts: libkdevplatform4-devel
Requires: libkdevplatform%{libkdev_major} = %{version}
+Conflicts: libkdevplatform4-devel
+# Not installed automatically
+Requires: ktexteditor-devel
+Requires: threadweaver-devel
%description -n kdevplatform-devel
This package contains the development files for building integrated
@@ -143,10 +146,10 @@
Summary: Translations for package %{name}
Group: System/Localization
Requires: %{name} = %{version}
-Provides: %{name}-lang-all = %{version}
Supplements: packageand(bundle-lang-other:%{name})
-BuildArch: noarch
Conflicts: kdevelop4-lang
+Provides: %{name}-lang-all = %{version}
+BuildArch: noarch
%description lang
Provides translations to the package %{name}
@@ -155,9 +158,9 @@
Summary: Translations for package kdevplatform
Group: System/Localization
Requires: kdevplatform = %{version}
-Provides: kdevplatform-lang-all = %{version}
Supplements: packageand(bundle-lang-other:kdevplatform)
Conflicts: kdevplatform4-lang
+Provides: kdevplatform-lang-all = %{version}
BuildArch: noarch
%description -n kdevplatform-lang
@@ -165,6 +168,7 @@
%prep
%setup -q -n %{rname}-%{version}
+%patch0 -p1
%build
%cmake_kf5 -d build
@@ -195,20 +199,16 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%post -n kdevplatform -p /sbin/ldconfig
%postun -n kdevplatform -p /sbin/ldconfig
-
%post -n libkdevplatform%{libkdev_major} -p /sbin/ldconfig
%postun -n libkdevplatform%{libkdev_major} -p /sbin/ldconfig
%files -n libkdevplatform%{libkdev_major}
-%defattr(-,root,root)
%license COPYING*
%{_kf5_libdir}/libKDevPlatform*.so.*
%files
-%defattr(-,root,root)
%license COPYING*
%doc README.md
%dir %{_kf5_iconsdir}/hicolor/256x256
@@ -249,13 +249,10 @@
%{_kf5_sharedir}/mime/packages/kdevclang.xml
%files lang -f %{name}.lang
-%defattr(-,root,root)
%files -n kdevplatform-lang -f kdevplatform.lang
-%defattr(-,root,root)
%files -n kdevplatform
-%defattr(-,root,root)
%license kdevplatform/COPYING*
%doc kdevplatform/README.md
%{_kf5_bindir}/kdev_dbus_socket_transformer
@@ -268,7 +265,6 @@
%{_kf5_sharedir}/kdevplatform/
%files -n kdevplatform-devel
-%defattr(-,root,root)
%license COPYING*
%{_kf5_libdir}/libKDevPlatform*.so
%{_kf5_libdir}/cmake/KDevPlatform/
++++++ kdevplatform-reduce-dependencies.diff ++++++
commit 86b746ce5325d351d64b83efb8472b0dcd05fdb8
Author: Friedrich W. H. Kossebau
Date: Tue Feb 20 20:37:49 2018 +0100
Clean up link interfaces of KDevPlatform libraries
Test Plan:
Created helper files including all headers per library and linking against
the library to test which libs need to be in the public link interface.
All normal & playground plugins still built against KDevPlatform.
Reviewers: #kdevelop, apol
Reviewed By: #kdevelop, apol
Subscribers: apol, kdevelop-devel
Differential Revision: https://phabricator.kde.org/D10696
diff --git a/kdevplatform/KDevPlatformConfig.cmake.in b/kdevplatform/KDevPlatformConfig.cmake.in
index 8905df8844..4d59596670 100644
--- a/kdevplatform/KDevPlatformConfig.cmake.in
+++ b/kdevplatform/KDevPlatformConfig.cmake.in
@@ -6,32 +6,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformMacros.cmake")
include(CMakeFindDependencyMacro)
-find_dependency(Qt5Concurrent "@QT_MIN_VERSION@")
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
-find_dependency(Qt5Quick "@QT_MIN_VERSION@")
-find_dependency(Qt5QuickWidgets "@QT_MIN_VERSION@")
@KDEV_FIND_DEP_QT5TEST@
-find_dependency(KF5Archive "@KF5_DEP_VERSION@")
-find_dependency(KF5Config "@KF5_DEP_VERSION@")
-find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
-find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
-find_dependency(KF5I18n "@KF5_DEP_VERSION@")
-find_dependency(KF5IconThemes "@KF5_DEP_VERSION@")
-find_dependency(KF5ItemModels "@KF5_DEP_VERSION@")
-find_dependency(KF5ItemViews "@KF5_DEP_VERSION@")
-find_dependency(KF5JobWidgets "@KF5_DEP_VERSION@")
-find_dependency(KF5KCMUtils "@KF5_DEP_VERSION@")
-find_dependency(KF5KIO "@KF5_DEP_VERSION@")
-find_dependency(KF5NewStuff "@KF5_DEP_VERSION@")
-find_dependency(KF5Notifications "@KF5_DEP_VERSION@")
-find_dependency(KF5NotifyConfig "@KF5_DEP_VERSION@")
-find_dependency(KF5Parts "@KF5_DEP_VERSION@")
-find_dependency(KF5Service "@KF5_DEP_VERSION@")
find_dependency(KF5TextEditor "@KF5_DEP_VERSION@")
find_dependency(KF5ThreadWeaver "@KF5_DEP_VERSION@")
-find_dependency(KF5WindowSystem "@KF5_DEP_VERSION@")
-
-find_dependency(Grantlee5)
include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformTargets.cmake")
diff --git a/kdevplatform/debugger/CMakeLists.txt b/kdevplatform/debugger/CMakeLists.txt
index 08881a1185..24b70c0504 100644
--- a/kdevplatform/debugger/CMakeLists.txt
+++ b/kdevplatform/debugger/CMakeLists.txt
@@ -27,14 +27,13 @@ ecm_qt_declare_logging_category(KDevPlatformDebugger_LIB_SRCS
)
kdevplatform_add_library(KDevPlatformDebugger SOURCES ${KDevPlatformDebugger_LIB_SRCS})
target_link_libraries(KDevPlatformDebugger
-LINK_PUBLIC
+PUBLIC
KDev::Interfaces
KDev::Util
-LINK_PRIVATE
- Qt5::Core
+PRIVATE
+ KDev::Sublime
KF5::Notifications
KF5::TextEditor
- KDev::Sublime
)
install(FILES
diff --git a/kdevplatform/documentation/CMakeLists.txt b/kdevplatform/documentation/CMakeLists.txt
index 65b9414950..0f2419a028 100644
--- a/kdevplatform/documentation/CMakeLists.txt
+++ b/kdevplatform/documentation/CMakeLists.txt
@@ -30,7 +30,12 @@ ecm_qt_declare_logging_category(KDevPlatformDocumentation_LIB_SRCS
ki18n_wrap_ui(KDevPlatformDocumentation_LIB_SRCS documentationfindwidget.ui)
kdevplatform_add_library(KDevPlatformDocumentation SOURCES ${KDevPlatformDocumentation_LIB_SRCS})
-target_link_libraries(KDevPlatformDocumentation PUBLIC KDev::Interfaces PRIVATE KDev::Util)
+target_link_libraries(KDevPlatformDocumentation
+PUBLIC
+ KDev::Interfaces
+PRIVATE
+ KDev::Util
+)
if(USE_QTWEBKIT)
target_link_libraries(KDevPlatformDocumentation PRIVATE Qt5::WebKitWidgets)
diff --git a/kdevplatform/interfaces/CMakeLists.txt b/kdevplatform/interfaces/CMakeLists.txt
index 338dd84f1f..fd3f6200f6 100644
--- a/kdevplatform/interfaces/CMakeLists.txt
+++ b/kdevplatform/interfaces/CMakeLists.txt
@@ -49,13 +49,10 @@ configure_file(ipluginversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/ipluginversion.h)
kdevplatform_add_library(KDevPlatformInterfaces SOURCES ${KDevPlatformInterfaces_LIB_SRCS})
target_link_libraries(KDevPlatformInterfaces
-LINK_PUBLIC
- KF5::Parts
+PUBLIC
KF5::TextEditor
-LINK_PRIVATE
- KF5::ConfigCore
+PRIVATE
KF5::I18n
- KF5::Service
)
install(FILES
diff --git a/kdevplatform/language/CMakeLists.txt b/kdevplatform/language/CMakeLists.txt
index 437dfb33ca..0d8d40055b 100644
--- a/kdevplatform/language/CMakeLists.txt
+++ b/kdevplatform/language/CMakeLists.txt
@@ -177,19 +177,20 @@ ki18n_wrap_ui(KDevPlatformLanguage_LIB_SRCS
kdevplatform_add_library(KDevPlatformLanguage SOURCES ${KDevPlatformLanguage_LIB_SRCS})
target_include_directories(KDevPlatformLanguage PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(KDevPlatformLanguage LINK_PUBLIC
- KF5::ThreadWeaver
- KDev::Interfaces
- KDev::Serialization
-LINK_PRIVATE
- Grantlee5::Templates
- KF5::GuiAddons
- KF5::TextEditor
- KF5::Parts
- KF5::Archive
- KF5::IconThemes
- KDev::Util
- KDev::Project
+target_link_libraries(KDevPlatformLanguage
+PUBLIC
+ KDev::Serialization
+ KDev::Interfaces
+ KDev::Util
+ KF5::ThreadWeaver
+PRIVATE
+ KDev::Project
+ KF5::GuiAddons
+ KF5::TextEditor
+ KF5::Parts
+ KF5::Archive
+ KF5::IconThemes
+ Grantlee5::Templates
)
install(FILES
diff --git a/kdevplatform/outputview/CMakeLists.txt b/kdevplatform/outputview/CMakeLists.txt
index 5050d6be8c..1f56b5551f 100644
--- a/kdevplatform/outputview/CMakeLists.txt
+++ b/kdevplatform/outputview/CMakeLists.txt
@@ -18,8 +18,11 @@ ecm_qt_declare_logging_category(outputviewinterfaces_LIB_SRCS
CATEGORY_NAME "kdevplatform.outputview"
)
kdevplatform_add_library(KDevPlatformOutputView SOURCES ${outputviewinterfaces_LIB_SRCS})
-target_link_libraries(KDevPlatformOutputView PRIVATE
- Qt5::Core
+target_link_libraries(KDevPlatformOutputView
+PUBLIC
+ KF5::CoreAddons
+ Qt5::Widgets
+PRIVATE
KDev::Interfaces
KDev::Util
)
diff --git a/kdevplatform/project/CMakeLists.txt b/kdevplatform/project/CMakeLists.txt
index c61e8de32e..93c528d9ce 100644
--- a/kdevplatform/project/CMakeLists.txt
+++ b/kdevplatform/project/CMakeLists.txt
@@ -27,13 +27,13 @@ ki18n_wrap_ui( KDevPlatformProject_LIB_SRCS widgets/dependencieswidget.ui)
kdevplatform_add_library(KDevPlatformProject SOURCES ${KDevPlatformProject_LIB_SRCS})
target_link_libraries(KDevPlatformProject
-LINK_PUBLIC
+PUBLIC
KDev::Interfaces
KDev::Util # util/path.h
-LINK_PRIVATE
+ KDev::Vcs
+PRIVATE
KDev::Interfaces
KDev::Serialization
- KDev::Vcs
KF5::KIOWidgets
Qt5::Concurrent
)
diff --git a/kdevplatform/serialization/CMakeLists.txt b/kdevplatform/serialization/CMakeLists.txt
index 83d6319..b1728dc 100644
--- a/kdevplatform/serialization/CMakeLists.txt
+++ b/kdevplatform/serialization/CMakeLists.txt
@@ -15,9 +15,9 @@ ecm_qt_declare_logging_category(KDevPlatformSerialization_LIB_SRCS
kdevplatform_add_library(KDevPlatformSerialization SOURCES ${KDevPlatformSerialization_LIB_SRCS})
target_link_libraries(KDevPlatformSerialization
-LINK_PUBLIC
+PUBLIC
KDev::Interfaces
-LINK_PRIVATE
+PRIVATE
KDev::Util
)
diff --git a/kdevplatform/shell/CMakeLists.txt b/kdevplatform/shell/CMakeLists.txt
index ffda4dc4bd..1e9fdade50 100644
--- a/kdevplatform/shell/CMakeLists.txt
+++ b/kdevplatform/shell/CMakeLists.txt
@@ -128,13 +128,18 @@ ki18n_wrap_ui(KDevPlatformShell_LIB_SRCS
qt5_add_resources(KDevPlatformShell_LIB_SRCS kdevplatformshell.qrc)
kdevplatform_add_library(KDevPlatformShell SOURCES ${KDevPlatformShell_LIB_SRCS})
target_link_libraries(KDevPlatformShell
-LINK_PUBLIC
- KF5::XmlGui
-
+PUBLIC
KDev::Sublime
KDev::OutputView
KDev::Interfaces
-LINK_PRIVATE
+ KDev::Language
+ KF5::XmlGui
+PRIVATE
+ KDev::Debugger
+ KDev::Project
+ KDev::Vcs
+ KDev::Util
+ KDev::Documentation
KF5::GuiAddons
KF5::ConfigWidgets
KF5::IconThemes
@@ -150,13 +155,6 @@ LINK_PRIVATE
KF5::KCMUtils #for KPluginSelector, not sure why it is in kcmutils
KF5::NewStuff # template config page
KF5::Archive # template config page
-
- KDev::Debugger
- KDev::Project
- KDev::Vcs
- KDev::Language
- KDev::Util
- KDev::Documentation
)
if(APPLE)
target_link_libraries(KDevPlatformShell PRIVATE "-framework AppKit")
diff --git a/kdevplatform/sublime/CMakeLists.txt b/kdevplatform/sublime/CMakeLists.txt
index 5148529afa..53fe7681d7 100644
--- a/kdevplatform/sublime/CMakeLists.txt
+++ b/kdevplatform/sublime/CMakeLists.txt
@@ -34,8 +34,11 @@ ecm_qt_declare_logging_category(sublime_LIB_SRCS
)
kdevplatform_add_library(KDevPlatformSublime SOURCES ${sublime_LIB_SRCS})
target_link_libraries(KDevPlatformSublime
- LINK_PRIVATE KF5::KIOWidgets
- LINK_PUBLIC KF5::Parts)
+PUBLIC
+ KF5::Parts
+PRIVATE
+ KF5::KIOWidgets
+)
install(FILES
area.h
diff --git a/kdevplatform/tests/CMakeLists.txt b/kdevplatform/tests/CMakeLists.txt
index 961d0cea96..79db345b19 100644
--- a/kdevplatform/tests/CMakeLists.txt
+++ b/kdevplatform/tests/CMakeLists.txt
@@ -19,14 +19,13 @@ set(kdevtests_LIB_SRCS
)
kdevplatform_add_library(KDevPlatformTests SOURCES ${kdevtests_LIB_SRCS})
-target_link_libraries(KDevPlatformTests LINK_PUBLIC
+target_link_libraries(KDevPlatformTests
+PUBLIC
KDev::Shell
KDev::Language
KDev::Project
KDev::Debugger
-)
-target_link_libraries(KDevPlatformTests LINK_PRIVATE
- Qt5::Core
+PRIVATE
Qt5::Test
)
diff --git a/kdevplatform/util/CMakeLists.txt b/kdevplatform/util/CMakeLists.txt
index 728b8920a1..5fecb40d2b 100644
--- a/kdevplatform/util/CMakeLists.txt
+++ b/kdevplatform/util/CMakeLists.txt
@@ -53,10 +53,10 @@ ecm_qt_declare_logging_category(KDevPlatformUtil_LIB_SRCS
ki18n_wrap_ui(KDevPlatformUtil_LIB_SRCS ${KDevPlatformUtil_LIB_US})
kdevplatform_add_library(KDevPlatformUtil SOURCES ${KDevPlatformUtil_LIB_SRCS})
target_link_libraries(KDevPlatformUtil
-LINK_PUBLIC
+PUBLIC
KDev::Interfaces
KF5::ItemModels
-LINK_PRIVATE
+PRIVATE
KF5::ConfigWidgets
KF5::TextEditor
KF5::GuiAddons
diff --git a/kdevplatform/vcs/CMakeLists.txt b/kdevplatform/vcs/CMakeLists.txt
index 135129f5f0..36203f29aa 100644
--- a/kdevplatform/vcs/CMakeLists.txt
+++ b/kdevplatform/vcs/CMakeLists.txt
@@ -55,13 +55,13 @@ ecm_qt_declare_logging_category(KDevPlatformVcs_LIB_SRCS
ki18n_wrap_ui(KDevPlatformVcs_LIB_SRCS ${KDevPlatformVcs_UIS})
kdevplatform_add_library(KDevPlatformVcs SOURCES ${KDevPlatformVcs_LIB_SRCS})
target_link_libraries(KDevPlatformVcs
-LINK_PUBLIC
+PUBLIC
KDev::OutputView
KDev::Interfaces
-LINK_PRIVATE
+PRIVATE
+ KDev::Util
KF5::KIOWidgets
KF5::Parts
- KDev::Util
)
install(FILES