From c389607c3c2c60c356014760b89edb0faacabbeea31d2f18d93f1107fd875a48 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:45:39 +0000 Subject: [PATCH 1/4] 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 + +- 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 From ef0f465ff145e080527aa8bfc92be88420db993683fc2f4cde0ac1319941a6df Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:23:23 +0000 Subject: [PATCH 2/4] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=101 --- umbrello-18.11.80.tar.xz | 3 --- umbrello-18.11.90.tar.xz | 3 +++ umbrello.changes | 13 +++++++++++++ umbrello.spec | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 umbrello-18.11.80.tar.xz create mode 100644 umbrello-18.11.90.tar.xz diff --git a/umbrello-18.11.80.tar.xz b/umbrello-18.11.80.tar.xz deleted file mode 100644 index 4b84e37..0000000 --- a/umbrello-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7efc2af1cf3e67e66901ff21d5cc8e822ca7a0c79661a46a929458078a0ef72c -size 3048388 diff --git a/umbrello-18.11.90.tar.xz b/umbrello-18.11.90.tar.xz new file mode 100644 index 0000000..fb877e9 --- /dev/null +++ b/umbrello-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01e1d2171a99db4ed8c21aca8670e9987e69c256cb4dca7f0dc357252cd29055 +size 3048820 diff --git a/umbrello.changes b/umbrello.changes index 1d38312..ed26fac 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 03 20:56:31 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * JavaImport: Convert Java specific notation '...' into a language independent array definition (kde#401290) + * Fix 'SQL code indexes wrong field for foreign key' (kde#292239) + * Crash fix in case of exporting an entity relation diagram + * Fix 'Endless loop on importing mysql schema' (kde#98082) + ------------------------------------------------------------------- Tue Nov 20 06:23:09 UTC 2018 - Luca Beltrame diff --git a/umbrello.spec b/umbrello.spec index 676e2a5..ddab5ca 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: umbrello -Version: 18.11.80 +Version: 18.11.90 Release: 0 Summary: UML Modeller License: GPL-2.0-only AND GFDL-1.2-only AND GPL-3.0-or-later From 0f65af2f5d3c3db9389ad67b2a451e520e5f25f40d11fddd5c7dd112c9ba535f Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:51:39 +0000 Subject: [PATCH 3/4] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=102 --- umbrello-18.11.90.tar.xz | 3 --- umbrello-18.12.0.tar.xz | 3 +++ umbrello.changes | 15 +++++++++++++++ umbrello.spec | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 umbrello-18.11.90.tar.xz create mode 100644 umbrello-18.12.0.tar.xz diff --git a/umbrello-18.11.90.tar.xz b/umbrello-18.11.90.tar.xz deleted file mode 100644 index fb877e9..0000000 --- a/umbrello-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01e1d2171a99db4ed8c21aca8670e9987e69c256cb4dca7f0dc357252cd29055 -size 3048820 diff --git a/umbrello-18.12.0.tar.xz b/umbrello-18.12.0.tar.xz new file mode 100644 index 0000000..a39e59b --- /dev/null +++ b/umbrello-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ed4c5021fe96d89000dfe56a1401a939da00d42845541c9ed8eb730c1e62597 +size 3049092 diff --git a/umbrello.changes b/umbrello.changes index ed26fac..b48022e 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Dec 14 06:09:23 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * Fix KDE CI compile error with Qt 5.10 on linux + * Fix -Wimplicit-fallthrough issue + * Make call to QUrl::adjusted() really working + * Make call to QString::toLower() really working + * Make call to QString::simplified() really working + * Fix output of used Qt version for KF5 builds + ------------------------------------------------------------------- Mon Dec 03 20:56:31 UTC 2018 - lbeltrame@kde.org diff --git a/umbrello.spec b/umbrello.spec index ddab5ca..e15fbf0 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: umbrello -Version: 18.11.90 +Version: 18.12.0 Release: 0 Summary: UML Modeller License: GPL-2.0-only AND GFDL-1.2-only AND GPL-3.0-or-later From 5fa5ebea15c0c199859eef18754cc073f3673c4b542e6a8a54c064c24f55eb97 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 23:09:32 +0000 Subject: [PATCH 4/4] Fix wrong beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=103 --- umbrello.changes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/umbrello.changes b/umbrello.changes index b48022e..be480d0 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -37,7 +37,7 @@ 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 + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Too many changes to list here @@ -101,7 +101,7 @@ Thu Jul 26 13:01:08 UTC 2018 - lbeltrame@kde.org - Update to 18.07.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * Too many changes to list here @@ -157,7 +157,7 @@ Fri Apr 06 07:10:18 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * Too many changes to list here @@ -316,7 +316,7 @@ Sat Aug 5 18:19:55 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -413,7 +413,7 @@ Sat Mar 25 23:10:58 CET 2017 - lbeltrame@kde.org - Update to 17.03.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * Too many changes to list here - Add upstream patches to fix build: @@ -510,7 +510,7 @@ Mon Aug 8 15:56:29 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.07.90 * KDE Applications 16.07.90 (16.08-RC) - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php ------------------------------------------------------------------- @@ -626,7 +626,7 @@ Fri Aug 7 07:07:27 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php -------------------------------------------------------------------