From c389607c3c2c60c356014760b89edb0faacabbeea31d2f18d93f1107fd875a48 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 24 Nov 2018 23:45:39 +0000
Subject: [PATCH] KDE Applications 18.12.0 Beta (last try; fix any other issue
 post acceptance)

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=100
---
 umbrello-18.08.3.tar.xz  |  3 ---
 umbrello-18.11.80.tar.xz |  3 +++
 umbrello.changes         | 15 +++++++++++++++
 umbrello.spec            | 26 +++++++++++++-------------
 4 files changed, 31 insertions(+), 16 deletions(-)
 delete mode 100644 umbrello-18.08.3.tar.xz
 create mode 100644 umbrello-18.11.80.tar.xz

diff --git a/umbrello-18.08.3.tar.xz b/umbrello-18.08.3.tar.xz
deleted file mode 100644
index 7249b65..0000000
--- a/umbrello-18.08.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80d24252b958dea167d10ee97b969f85cfa86e3f95f4a9d94c6e368a3e9d667e
-size 3048228
diff --git a/umbrello-18.11.80.tar.xz b/umbrello-18.11.80.tar.xz
new file mode 100644
index 0000000..4b84e37
--- /dev/null
+++ b/umbrello-18.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7efc2af1cf3e67e66901ff21d5cc8e822ca7a0c79661a46a929458078a0ef72c
+size 3048388
diff --git a/umbrello.changes b/umbrello.changes
index 095f736..1d38312 100644
--- a/umbrello.changes
+++ b/umbrello.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Nov 20 06:23:09 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Tue Nov 20 05:57:38 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.11.80
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.11.80.php
+- Changes since 18.08.3:
+  * Too many changes to list here
+
 -------------------------------------------------------------------
 Thu Nov 08 20:44:20 UTC 2018 - lbeltrame@kde.org
 
diff --git a/umbrello.spec b/umbrello.spec
index cec91f1..676e2a5 100644
--- a/umbrello.spec
+++ b/umbrello.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package umbrello
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,21 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%bcond_without  lang
 
-Name:           umbrello
-Version:        18.08.3
-Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%bcond_without  lang
+Name:           umbrello
+Version:        18.11.80
+Release:        0
 Summary:        UML Modeller
-License:        GPL-2.0 and GFDL-1.2 and GPL-3.0+
+License:        GPL-2.0-only AND GFDL-1.2-only AND GPL-3.0-or-later
 Group:          Development/Tools/Other
-Url:            http://www.kde.org/
+URL:            http://www.kde.org/
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules
@@ -63,9 +63,9 @@ BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5Xml)
+Recommends:     %{name}-lang
 Obsoletes:      umbrello5 < %{version}
 Provides:       umbrello5 = %{version}
-Recommends:     %{name}-lang
 
 %description
 Umbrello is a UML modelling application.
@@ -89,13 +89,13 @@ export CFLAGS="%{optflags} -fPIC"
   %kf5_makeinstall -C build
 %if %{with lang}
   %find_lang %{name} --with-man --all-name
-  %kf5_find_htmldocs
+  %{kf5_find_htmldocs}
 %endif
   %suse_update_desktop_file    org.kde.umbrello       Development Design
 
 %files
-%defattr(-,root,root)
-%doc COPYING COPYING.DOC README
+%license COPYING COPYING.DOC
+%doc README
 %dir %{_kf5_appstreamdir}
 %doc %lang(en) %{_kf5_htmldir}/en/umbrello
 %{_kf5_applicationsdir}/org.kde.umbrello.desktop
@@ -109,7 +109,7 @@ export CFLAGS="%{optflags} -fPIC"
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
 %endif
 
 %changelog