From db83c9473e9cd901fec7c08f701bf52f9dce33cf381614815648e4c5a46b1142 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sat, 15 Apr 2017 13:29:13 +0000
Subject: [PATCH] Make a merry car great again

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

diff --git a/fix-appstream-install-1.patch b/fix-appstream-install-1.patch
deleted file mode 100644
index 6c5bbad..0000000
--- a/fix-appstream-install-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index e6d4c39..0000000
--- a/fix-appstream-install-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 1bd96cc..d4affb4 100644
--- a/umbrello.changes
+++ b/umbrello.changes
@@ -10,6 +10,9 @@ Wed Apr 12 20:26:14 CEST 2017 - lbeltrame@kde.org
   * release-windows-packages: pack debug package with 'all' command
   * Fix 'org.kde.umbrello.appdata.xml specifies wrong binary name'.
   * Fix 'KF5 version fails to install'.
+- Remove patches, now upstream:
+  * fix-appstream-install-1.patch
+  * fix-appstream-install-2.patch
 
 -------------------------------------------------------------------
 Sat Mar 25 23:10:58 CET 2017 - lbeltrame@kde.org
diff --git a/umbrello.spec b/umbrello.spec
index 8e3404f..f907aee 100644
--- a/umbrello.spec
+++ b/umbrello.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           umbrello
 Version:        17.03.90
 Release:        0
@@ -27,10 +26,6 @@ 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
@@ -74,8 +69,6 @@ Umbrello is a UML modelling application.
 
 %prep
 %setup -q
-%patch101 -p1
-%patch102 -p1
 
 %build
 %ifarch ppc64