From e2b6caeea930147ba4ff6c8aba8ed9e804fc8577 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Oct 06 2017 07:25:40 +0000
Subject: Update to 5.1.80 (beta)


---

diff --git a/.gitignore b/.gitignore
index b1263bf..0688c3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /kdevelop-5.1.0.tar.xz
 /kdevelop-5.1.1.tar.xz
 /kdevelop-5.1.2.tar.xz
+/kdevelop-5.1.80.tar.xz
diff --git a/kdevelop.spec b/kdevelop.spec
index 22f6eaa..e206edd 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -2,7 +2,7 @@
 Name:           kdevelop
 Summary:        Integrated Development Environment for C++/C
 Epoch:          9
-Version:        5.1.2
+Version:        5.1.80
 Release:        1%{?dist}
 License:        GPLv2
 URL:            http://www.kdevelop.org/
@@ -21,10 +21,13 @@ BuildRequires:  gettext
 BuildRequires:  llvm-devel
 BuildRequires:  clang-devel
 BuildRequires:  okteta-devel
-BuildRequires:  kdevplatform-devel >= 5.0
+BuildRequires:  pcre-devel
+BuildRequires:  subversion-devel
 BuildRequires:  kdevelop-pg-qt-devel >= 2.0
 BuildRequires:  libksysguard-devel
 BuildRequires:  grantlee-qt5-devel
+%{?grantlee5_requires}
+BuildRequires:  libkomparediff2-devel
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-karchive-devel
@@ -70,12 +73,16 @@ BuildRequires: valgrind-devel
 Provides:  kdevelop-custom-buildsystem = 9:%{version}-%{release}
 Obsoletes: kdevelop-custom-buildsystem < 1.2.1-5
 
+Provides:  kdevplatform = %{version}-%{release}
+Obsoletes: kdevplatform < 5.1.80-1
+
 # kdevappwizard/templates/qmake_qt4guiapp moved here
 Conflicts: kapptemplate < 16.03.80
 
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: git
 Requires: cmake
+Requires: cppcheck
 
 %description
 The KDevelop Integrated Development Environment provides many features
@@ -105,6 +112,8 @@ individual needs.
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: kdevplatform-devel = %{version}-%{release}
+Obsoletes: kdevplatform-devel < 5.1.80-1
 %description devel
 %{summary}.
 
@@ -113,7 +122,8 @@ Summary: %{name} runtime libraries
 # helps multilib upgrades
 Obsoletes: kdevelop < 9:3.9.95
 Requires: %{name} = %{epoch}:%{version}-%{release}
-#Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
+Provides: kdevplatform-libs = %{version}-%{release}
+Obsoletes: kdevplatform-libs < 5.1.80-1
 %description libs
 %{summary}.
 
@@ -175,11 +185,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_bindir}/kdevelop
 %{_bindir}/kdevelop!
 %{_bindir}/kdev_includepathsconverter
+%{_bindir}/kdev_dbus_socket_transformer
+%{_bindir}/kdevplatform_shell_environment.sh
+%{_bindir}/kdev_format_source
 %{_datadir}/kdev*/
 %{_datadir}/applications/org.kde.kdevelop.desktop
 %{_datadir}/applications/org.kde.kdevelop_ps.desktop
 %{_datadir}/kservices5/*.desktop
-%{_datadir}/kxmlgui5/kdevcppcheck/kdevcppcheck.rc
 %{_datadir}/mime/packages/kdevelop.xml
 %{_datadir}/mime/packages/kdevclang.xml
 %{_datadir}/plasma/plasmoids/kdevelopsessions/*
@@ -188,24 +200,39 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/appdata/org.kde.kdevelop.appdata.xml
 %{_docdir}/HTML/*/kdevelop/
+%{_kf5_datadir}/kservicetypes5/kdevelopplugin.desktop
+%{_sysconfdir}/xdg/kdevelop.categories
+%{_sysconfdir}/xdg/kdevplatform.categories
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files libs
+%{_libdir}/lib*.so.*
 %{_libdir}/*.so
 %{_libdir}/libKDevClangPrivate.so*
-%{_kf5_qtplugindir}/kdevplatform/
 %{_kf5_qtplugindir}/krunner_kdevelopsessions.so
 %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_kdevelopsessions.so
+%{_kf5_qtplugindir}/kdevplatform/
+%{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/kdev_filters.so
+# FIXME/TODO: does not use standard %%{?grantlee5_plugindir}, is that a problem?  -- rex
+%dir %{_kf5_qtplugindir}/grantlee/
+%dir %{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/
+%{_qt5_prefix}/qml/org/kde/kdevplatform/
 
 %files devel
 %{_libdir}/cmake/KDevelop/
+%{_libdir}/cmake/KDevPlatform
 %{_includedir}/kdevelop/
+%{_includedir}/kdevplatform/
+%{_libdir}/lib*.so
 %{rpm_macros_dir}/macros.kdevelop
 
-
 %changelog
+* Fri Oct 06 2017 Jan Grulich <jgrulich@redhat.com> - 5.1.80-1
+- Update to 5.1.80 (beta)
+- KDevplatform merged to KDevelop
+
 * Tue Aug 29 2017 Jan Grulich <jgrulich@redhat.com> - 5.1.2-1
 - Update to 5.1.2
 
diff --git a/sources b/sources
index 4c07a8a..531cafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kdevelop-5.1.2.tar.xz) = 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b
+SHA512 (kdevelop-5.1.80.tar.xz) = 0f10ef3e81101547aff5372e0aff297db10af91d90fec6ffdf5fbd917dcb9d0d0d8f604dd42da1315a0eea3bad9d88c391386c288006ff8b7dcb7cb1b54eacf0