From 1ea1bbf64f862b4838c10c830c6564177bc91446 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Oct 02 2018 11:11:08 +0000
Subject: 5.2.80 (beta)


---

diff --git a/.gitignore b/.gitignore
index 46dc41f..81f24e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /kdevelop-5.2.1.tar.xz
 /kdevelop-5.2.3.tar.xz
 /kdevelop-5.2.4.tar.xz
+/kdevelop-5.2.80.tar.xz
diff --git a/kdevelop-5.2.3-qmake.patch b/kdevelop-5.2.3-qmake.patch
index d18f0b4..bfa5d2c 100644
--- a/kdevelop-5.2.3-qmake.patch
+++ b/kdevelop-5.2.3-qmake.patch
@@ -1,13 +1,15 @@
-diff -up kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp
---- kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me	2018-08-16 16:38:38.934730806 +0200
-+++ kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp	2018-08-16 16:39:39.222043168 +0200
-@@ -83,14 +83,14 @@ QString QMakeConfig::qmakeExecutable(con
+diff --git a/plugins/qmakemanager/qmakeconfig.cpp b/plugins/qmakemanager/qmakeconfig.cpp
+index 98dc77b..92f221a 100644
+--- a/plugins/qmakemanager/qmakeconfig.cpp
++++ b/plugins/qmakemanager/qmakeconfig.cpp
+@@ -82,15 +82,15 @@ QString QMakeConfig::qmakeExecutable(const IProject* project)
+             }
          }
      }
-     if (exe.isEmpty()) {
+-    if (exe.isEmpty()) {
 -        exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
 -    }
--    if (exe.isEmpty()) {
+     if (exe.isEmpty()) {
          exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt5"));
      }
      if (exe.isEmpty()) {
@@ -19,15 +21,19 @@ diff -up kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me kdevelop-5.2.3/p
      Q_ASSERT(!exe.isEmpty());
      return exe;
  }
-diff -up kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp
---- kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me	2018-08-16 16:37:36.662408159 +0200
-+++ kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp	2018-08-16 16:40:02.990166316 +0200
-@@ -37,7 +37,7 @@ namespace {
- QString qmakeCandidate()
+diff --git a/plugins/qthelp/qthelpqtdoc.cpp b/plugins/qthelp/qthelpqtdoc.cpp
+index 8f9f8e1..6770e03 100644
+--- a/plugins/qthelp/qthelpqtdoc.cpp
++++ b/plugins/qthelp/qthelpqtdoc.cpp
+@@ -38,9 +38,9 @@ QString qmakeCandidate()
  {
      // return the first qmake executable we can find
--    const QStringList candidates = {"qmake", "qmake-qt4", "qmake-qt5"};
-+    const QStringList candidates = {"qmake-qt5", "qmake-qt4", "qmake"};
+     const QStringList candidates {
+-        QStringLiteral("qmake"),
++        QStringLiteral("qmake-qt5"),
+         QStringLiteral("qmake-qt4"),
+-        QStringLiteral("qmake-qt5")
++        QStringLiteral("qmake")
+     };
      auto it = std::find_if(candidates.constBegin(), candidates.constEnd(), [](const QString& candidate) {
          return !QStandardPaths::findExecutable(candidate).isEmpty();
-     });
diff --git a/kdevelop.spec b/kdevelop.spec
index e6036c5..48a3a6b 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -2,7 +2,7 @@
 Name:           kdevelop
 Summary:        Integrated Development Environment for C++/C
 Epoch:          9
-Version:        5.2.4
+Version:        5.2.80
 Release:        1%{?dist}
 License:        GPLv2
 URL:            http://www.kdevelop.org/
@@ -195,9 +195,14 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/kdev*/
 %{_datadir}/applications/org.kde.kdevelop.desktop
 %{_datadir}/applications/org.kde.kdevelop_ps.desktop
+%{_datadir}/applications/org.kde.kdevelop_bzr.desktop
+%{_datadir}/applications/org.kde.kdevelop_git.desktop
+%{_datadir}/applications/org.kde.kdevelop_kdev4.desktop
+%{_datadir}/applications/org.kde.kdevelop_svn.desktop
 %{_datadir}/kservices5/*.desktop
 %{_datadir}/mime/packages/kdevelop.xml
 %{_datadir}/mime/packages/kdevclang.xml
+%{_datadir}/mime/packages/kdevgit.xml
 %{_datadir}/plasma/plasmoids/kdevelopsessions/*
 %{_datadir}/plasma/services/org.kde.plasma.dataengine.kdevelopsessions.operations
 %{_datadir}/knotifications5/kdevelop.notifyrc
@@ -233,6 +238,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{rpm_macros_dir}/macros.kdevelop
 
 %changelog
+* Tue Oct 02 2018 Jan Grulich <jgrulich@redhat.com> - 5.2.80-1
+- 5.2.80 (beta)
+
 * Mon Aug 27 2018 Jan Grulich <jgrulich@redhat.com> - 5.2.4-1
 - 5.2.4
 
diff --git a/sources b/sources
index 699bc19..0eb3064 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kdevelop-5.2.4.tar.xz) = 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
+SHA512 (kdevelop-5.2.80.tar.xz) = 9e9477d32321787900f2a2b67a9a4bd33d5ebb1e12e45d79057db5822a282cafeacbb579c1d71c0cbe684645eb1499e48efc391cee75667d3dd3bfac22a0856c