From 77f3325901a7bdfbf43b6f3ba1cceb58b4ad72d765611021bfcd0b1bf5d08b9b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sun, 26 Mar 2017 17:54:20 +0000
Subject: [PATCH] - Add upstream patches to fix build:   *
 fix-appstream-install-1.patch   * fix-appstream-install-2.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=51
---
 fix-appstream-install-1.patch | 27 +++++++++++++++++++++++++++
 fix-appstream-install-2.patch | 30 ++++++++++++++++++++++++++++++
 umbrello.changes              |  3 +++
 umbrello.spec                 |  6 ++++++
 4 files changed, 66 insertions(+)
 create mode 100644 fix-appstream-install-1.patch
 create mode 100644 fix-appstream-install-2.patch

diff --git a/fix-appstream-install-1.patch b/fix-appstream-install-1.patch
new file mode 100644
index 0000000..6c5bbad
--- /dev/null
+++ b/fix-appstream-install-1.patch
@@ -0,0 +1,27 @@
+From f1431eda6617dfc3ca2f37a994ef41f91f9cabad Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Sat, 25 Mar 2017 14:24:52 +0100
+Subject: [PATCH] Fix 'KF5 version fails to install'.
+
+org.kde.umbrello.appdata.xml is only installed by kf5 builds
+which means there is no need to add a '5' postfix to the name.
+
+BUG:378057
+FIXED-IN:2.21.80 (KDE Applications 17.03.80)
+---
+ umbrello/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 97d55f4..057b3d6 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -600,7 +600,7 @@ else()
+     string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}")
+     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}")
+     install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello5.desktop)
+-    install(FILES org.kde.umbrello5.appdata.xml  DESTINATION  ${KDE_INSTALL_METAINFODIR})
++    install(FILES org.kde.umbrello.appdata.xml  DESTINATION  ${KDE_INSTALL_METAINFODIR})
+ endif()
+ 
+ install( FILES
diff --git a/fix-appstream-install-2.patch b/fix-appstream-install-2.patch
new file mode 100644
index 0000000..e6d4c39
--- /dev/null
+++ b/fix-appstream-install-2.patch
@@ -0,0 +1,30 @@
+From 70aa7cf78289abbd9c26828c5119a71d766448a6 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Sat, 25 Mar 2017 14:52:31 +0100
+Subject: [PATCH] Fix 'org.kde.umbrello.appdata.xml specifies wrong binary
+ name'.
+
+The binary of umbrello for kf5 builds is named 'umbrello5'.
+
+BUG:378064
+FIXED-IN:2.21.90 (KDE Applications 17.03.90)
+---
+ umbrello/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 057b3d6..3ae6247 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -600,7 +600,10 @@ else()
+     string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}")
+     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}")
+     install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello5.desktop)
+-    install(FILES org.kde.umbrello.appdata.xml  DESTINATION  ${KDE_INSTALL_METAINFODIR})
++    file(READ org.kde.umbrello.appdata.xml UMBRELLO_APPDATA)
++    string(REPLACE "<binary>umbrello</binary>" "<binary>umbrello5</binary>" UMBRELLO_APPDATA_OUT "${UMBRELLO_APPDATA}")
++    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/org.kde.umbrello.appdata.xml "${UMBRELLO_APPDATA_OUT}")
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.umbrello.appdata.xml  DESTINATION  ${KDE_INSTALL_METAINFODIR})
+ endif()
+ 
+ install( FILES
diff --git a/umbrello.changes b/umbrello.changes
index 24254bb..ab721c5 100644
--- a/umbrello.changes
+++ b/umbrello.changes
@@ -7,6 +7,9 @@ Sat Mar 25 23:10:58 CET 2017 - lbeltrame@kde.org
   * https://www.kde.org/announcements/announce-applications-17.03.80.php
 - Changes since 16.12.3:
   * Too many changes to list here
+- Add upstream patches to fix build:
+  * fix-appstream-install-1.patch
+  * fix-appstream-install-2.patch
 
 -------------------------------------------------------------------
 Thu Mar  9 12:46:13 CET 2017 - lbeltrame@kde.org
diff --git a/umbrello.spec b/umbrello.spec
index b7e1936..95f1dca 100644
--- a/umbrello.spec
+++ b/umbrello.spec
@@ -27,6 +27,10 @@ License:        GPL-2.0 and GFDL-1.2
 Group:          Development/Tools/Other
 Url:            http://www.kde.org/
 Source0:        %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch101:       fix-appstream-install-1.patch
+# PATCH-FIX-UPSTREAM
+Patch102:       fix-appstream-install-2.patch
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules
 BuildRequires:  karchive-devel
@@ -70,6 +74,8 @@ Umbrello is a UML modelling application.
 
 %prep
 %setup -q
+%patch101 -p1
+%patch102 -p1
 
 %build
 %ifarch ppc64