[rpms/kdevelop-python] f43: Update to 4.90.90 (beta 1)

[rpms/kdevelop-python] f43: Update to 4.90.90 (beta 1)

[Jan Grulich]

A new commit has been pushed.

Repo   : rpms/kdevelop-python
Branch : f43
Commit : 8a5ce5c4b3317a0543109b4b87d564e03f1cc9df
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2015-11-12T15:21:11+01:00
Stats  : +85/-23 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kdevelop-python/c/8a5ce5c4b3317a0543109b4b87d564e03f1cc9df?branch=f43

Log:
Update to 4.90.90 (beta 1)

---
diff --git a/.gitignore b/.gitignore
index 40c3e49..36c2857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kdev-python-1.7.0-py3.tar.xz
 /kdev-python-1.7.1-py3.tar.xz
 /kdev-python-1.7.2-py3.tar.xz
+/kdev-python-4.90.90.tar.xz

diff --git a/kdev-python-missing-dependency.patch b/kdev-python-missing-dependency.patch
new file mode 100644
index 0000000..e4dfdc2
--- /dev/null
+++ b/kdev-python-missing-dependency.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1146905..3255226 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ find_package(PythonInterp 3.5 REQUIRED)
+ configure_file( "${kdevpython_SOURCE_DIR}/kdevpythonversion.h.cmake" "${kdevpython_BINARY_DIR}/kdevpythonversion.h" @ONLY )
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Test)
+-find_package(KF5 REQUIRED I18n NewStuff ItemModels ThreadWeaver TextEditor KCMUtils)
++find_package(KF5 REQUIRED I18n NewStuff ItemModels ThreadWeaver TextEditor KCMUtils KDELibs4Support)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop REQUIRED)
+ 
+@@ -94,6 +94,7 @@ target_link_libraries(kdevpythonlanguagesupport
+     KF5::ThreadWeaver
+     KF5::TextEditor
+     KF5::NewStuff
++    KF5::KDELibs4Support
+     kdevpythoncompletion
+     kdevpythonparser
+     kdevpythonduchain
+diff --git a/debugger/CMakeLists.txt b/debugger/CMakeLists.txt
+index 20ead1a..e7953cc 100644
+--- a/debugger/CMakeLists.txt
++++ b/debugger/CMakeLists.txt
+@@ -34,6 +34,7 @@ target_link_libraries(kdevpdb
+     KDev::Project    
+     KDev::Util
+     KF5::TextEditor
++    KF5::KDELibs4Support
+     ${KDE4WORKSPACE_PROCESSUI_LIBS}
+ )
+ 
+diff --git a/duchain/CMakeLists.txt b/duchain/CMakeLists.txt
+index 2da1253..d106f07 100644
+--- a/duchain/CMakeLists.txt
++++ b/duchain/CMakeLists.txt
+@@ -39,6 +39,7 @@ generate_export_header( kdevpythonduchain EXPORT_MACRO_NAME KDEVPYTHONDUCHAIN_EX
+ 
+ target_link_libraries( kdevpythonduchain LINK_PRIVATE
+     KF5::TextEditor
++    KF5::KDELibs4Support
+     KDev::Interfaces
+     KDev::Language
+     KDev::Project

diff --git a/kdevelop-python.spec b/kdevelop-python.spec
index 83e4e17..1ddfaef 100644
--- a/kdevelop-python.spec
+++ b/kdevelop-python.spec
@@ -1,11 +1,11 @@
 Name:       kdevelop-python
-Version:    1.7.2
+Version:    4.90.90
 %global py3_suffix -py3
 %global py3_tag .py3
-Release:    2%{?py3_tag}%{?dist}
+Release:    1%{?py3_tag}%{?dist}
 License:    GPLv2
 %global kdevelop_version %(echo %{version} | sed -e 's/^1\./4./g')
-Source0:    http://download.kde.org/stable/kdevelop/%{kdevelop_version}/src/kdev-python-%{version}%{?py3_suffix}.tar.xz
+Source0:    http://download.kde.org/stable/kdevelop/%{kdevelop_version}/src/kdev-python-%{version}.tar.xz
 
 # ensure the installed Python 3 scripts have #!/usr/bin/env python3
 Patch0:     kdev-python-1.7.0-py3-shebang.patch
@@ -16,15 +16,31 @@ Patch0:     kdev-python-1.7.0-py3-shebang.patch
 # brp-python-bytecompile script choke
 Patch1:     kdev-python-1.7.0-py3-doc-syntax.patch
 
+Patch2:     kdev-python-missing-dependency.patch
+
+
 Summary:    Python 3 Plugin for KDevelop
 URL:        https://www.kdevelop.org/
 
-BuildRequires:  kdelibs4-devel
-BuildRequires:  qtwebkit-devel
 BuildRequires:  kdevplatform-devel >= %{version}
+BuildRequires:  kdevelop-devel >= %{version}
 BuildRequires:  python3-devel >= 3.4
 BuildRequires:  gettext
 
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  extra-cmake-modules
+
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-knewstuff-devel
+BuildRequires:  kf5-kcmutils-devel
+BuildRequires:  kf5-ktexteditor-devel
+BuildRequires:  kf5-threadweaver-devel
+BuildRequires:  kf5-kitemmodels-devel
+BuildRequires:  kf5-kdelibs4support-devel
+
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtwebkit-devel
+
 # force using Python 3 for bytecompiling
 %global __python %{__python3}
 
@@ -41,10 +57,13 @@ Python 3 language support for the KDevelop Integrated Development Environment.
 # doc-syntax
 %patch1 -p1
 
+# add missing dependency on kdelibs4support
+%patch2 -p1 -b .missing-dependency
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ../
+%{cmake_kf5} ../
 popd
 make %{?_smp_mflags} -C %{_target_platform} 
 
@@ -53,7 +72,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # don't ship this Python 2 script, it is only used to generate the
 # documentation_files, it is not needed at runtime
-rm -f %{buildroot}%{_kde4_appsdir}/kdevpythonsupport/documentation_files/PyKDE4/parse_xml.py
+rm -f %{buildroot}%{_datadir}/kdevpythonsupport/documentation_files/PyKDE4/parse_xml.py
 
 %find_lang kdevpython
 
@@ -61,23 +80,20 @@ rm -f %{buildroot}%{_kde4_appsdir}/kdevpythonsupport/documentation_files/PyKDE4/
 %postun -p /sbin/ldconfig
 
 %files -f kdevpython.lang
-%doc DESIGN TODO README
-%{_kde4_datadir}/kde4/services/kdevpythonsupport.desktop
-%{_kde4_datadir}/kde4/services/kdevpdb.desktop
-%{_kde4_datadir}/kde4/services/kcm_kdevpythondocfiles.desktop
-%{_kde4_datadir}/kde4/services/kcm_kdevpythonpep8.desktop
-%{_kde4_libdir}/kde4/kdevpythonlanguagesupport.so
-%{_kde4_libdir}/kde4/kdevpdb.so
-%{_kde4_libdir}/kde4/kcm_docfiles.so
-%{_kde4_libdir}/kde4/kcm_pep8.so
-%{_kde4_libdir}/libkdev4pythonduchain.so
-%{_kde4_libdir}/libkdev4pythonparser.so
-%{_kde4_libdir}/libkdev4pythoncompletion.so
-%{_kde4_appsdir}/kdevpythonsupport
-%{_kde4_appsdir}/kdevappwizard/templates/*
-%{_kde4_configdir}/kdev_python_docfiles.knsrc
+%doc DESIGN README
+%{_libdir}/libkdevpythonduchain.so
+%{_libdir}/libkdevpythonparser.so
+%{_libdir}/libkdevpythoncompletion.so
+%{_datadir}/kdevpythonsupport
+%{_datadir}/kdevappwizard/templates/*
+%{_kf5_qtplugindir}/kdevplatform/24/kdevpdb.so
+%{_kf5_qtplugindir}/kdevplatform/24/kdevpythonlanguagesupport.so
+
 
 %changelog
+* Thu Nov 12 2015 Jan Grulich <jgrulich@redhat.com> - 4.90.90-1.py3
+- Update to 4.90.90 (beta 1)
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-2.py3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 

diff --git a/sources b/sources
index 56fc2ed..b3fddbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8703b00e63b40bba8137d5ef164554af  kdev-python-1.7.2-py3.tar.xz
+01c394465a749181375cabb90b9aaa59  kdev-python-4.90.90.tar.xz