From c0d1cddc7c70f16c3f5241cd63d26a563e5c500ade1ce9eeb557693726fd0e31 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:26:56 +0000 Subject: [PATCH 01/12] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=50 --- umbrello-16.12.3.tar.xz | 3 -- umbrello-17.03.80.tar.xz | 3 ++ umbrello.changes | 74 ++++++++++++++++++--------------- umbrello.spec | 88 ++++++++++++++++++++++++++++------------ 4 files changed, 106 insertions(+), 62 deletions(-) delete mode 100644 umbrello-16.12.3.tar.xz create mode 100644 umbrello-17.03.80.tar.xz diff --git a/umbrello-16.12.3.tar.xz b/umbrello-16.12.3.tar.xz deleted file mode 100644 index 3d2b7d8..0000000 --- a/umbrello-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94813479532c69336d642ff215059172d2054aa90a0a7050d73b5c01ab8392a8 -size 1636740 diff --git a/umbrello-17.03.80.tar.xz b/umbrello-17.03.80.tar.xz new file mode 100644 index 0000000..51d8cf6 --- /dev/null +++ b/umbrello-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcad5e45a1b7d61f4d13eec708fde6be3398c44dde21192777045a1fd87d0323 +size 1647476 diff --git a/umbrello.changes b/umbrello.changes index 0ed4fb4..24254bb 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 +- Changes since 16.12.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Mar 9 12:46:13 CET 2017 - lbeltrame@kde.org @@ -21,14 +31,14 @@ Thu Feb 9 07:28:52 UTC 2017 - lbeltrame@kde.org Sat Jan 14 09:11:16 UTC 2017 - lbeltrame@kde.org - - Update to KDE Applications 16.12.1 - * KDE Applications 16.12.1 + * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php ------------------------------------------------------------------- Tue Dec 13 20:12:10 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 + * KDE Applications 16.12.0 * https://www.kde.org/announcements/announce-applications-16.12.0.php @@ -135,7 +145,7 @@ Mon Apr 11 06:57:06 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:58:44 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.3 - * KDE Applications 15.12.3 + * KDE Applications 15.12.3 * https://www.kde.org/announcements/announce-applications-15.12.3.php * boo#970855 @@ -144,7 +154,7 @@ Sun Mar 13 15:58:44 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:27:25 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.2 - * KDE Applications 15.12.2 + * KDE Applications 15.12.2 * https://www.kde.org/announcements/announce-applications-15.12.2.php * boo#966605 @@ -153,7 +163,7 @@ Sat Feb 13 08:27:25 UTC 2016 - tittiatcoke@gmail.com Sat Jan 9 18:37:24 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.1 - * KDE Applications 15.12.1 + * KDE Applications 15.12.1 * https://www.kde.org/announcements/announce-applications-15.12.1.php * boo#961265 @@ -162,7 +172,7 @@ Sat Jan 9 18:37:24 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 13:34:53 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.0 - * KDE Applications 15.12.0 + * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 @@ -171,7 +181,7 @@ Sun Dec 13 13:34:53 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 20:24:32 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.3 - * KDE Applications 15.08.3 + * KDE Applications 15.08.3 * https://www.kde.org/announcements/announce-applications-15.08.3.php * boo#954531 @@ -180,7 +190,7 @@ Tue Nov 10 20:24:32 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:48:05 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.2 - * KDE Applications 15.08.2 + * KDE Applications 15.08.2 * https://www.kde.org/announcements/announce-applications-15.08.2.php @@ -188,7 +198,7 @@ Sun Oct 11 13:48:05 UTC 2015 - tittiatcoke@gmail.com Sun Sep 13 19:48:39 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.1 - * KDE Applications 15.08.1 + * KDE Applications 15.08.1 * https://www.kde.org/announcements/announce-applications-15.08.1.php @@ -515,44 +525,44 @@ Mon Apr 1 19:33:54 UTC 2013 - tittiatcoke@gmail.com Sat Mar 2 16:01:05 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.1 - * Contains bug fixes. See http://www.kde.org/announcements/ - for more information + * Contains bug fixes. See http://www.kde.org/announcements/ + for more information ------------------------------------------------------------------- Thu Jan 31 18:12:05 UTC 2013 - tittiatcoke@gmail.com - Update to 4.10.0 - * This is the final release for 4.10. Contains bugfixes + * This is the final release for 4.10. Contains bugfixes ------------------------------------------------------------------- Thu Jan 17 08:33:10 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.98 - * This is the third RC release for 4.10. Contains bugfixes + * This is the third RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Thu Jan 3 21:34:30 UTC 2013 - tittiatcoke@gmail.com - Update to 4.9.97 - * This is the second RC release for 4.10. Contains bugfixes + * This is the second RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Wed Dec 19 19:06:42 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.95 - * This is the first RC release for 4.10. Contains bugfixes + * This is the first RC release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sat Dec 1 20:29:46 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.90 - * This is the second Beta release for 4.10. Contains bugfixes + * This is the second Beta release for 4.10. Contains bugfixes ------------------------------------------------------------------- Sat Nov 24 13:13:02 UTC 2012 - tittiatcoke@gmail.com - Update to 4.9.80 - * see http://www.kde.org/announcements/announce-4.10-beta1.php + * see http://www.kde.org/announcements/announce-4.10-beta1.php * Umbrello: Line based diagram grid ------------------------------------------------------------------- @@ -572,7 +582,7 @@ Wed Sep 5 12:03:46 UTC 2012 - dmueller@suse.com - update to 4.9.1 * see http://kde.org/announcements/4.9.1/ for details - + ------------------------------------------------------------------- Sat Aug 4 15:09:04 UTC 2012 - ctrippe@opensuse.org @@ -636,7 +646,7 @@ Wed Jan 18 21:05:04 CET 2012 - dmueller@suse.de - update to 4.8.0 * first stable release of KDE 4.8 (only critical fixes over 4.7.98) * see http://kde.org/announcements/4.8/ for details - + ------------------------------------------------------------------- Tue Jan 10 18:45:13 CET 2012 - dmueller@suse.de @@ -644,7 +654,7 @@ Tue Jan 10 18:45:13 CET 2012 - dmueller@suse.de - update to 4.7.98 * RC2+ milestone release of KDE 4.8 * see http://kde.org/announcements/4.8/ for details - + ------------------------------------------------------------------- Wed Dec 7 11:30:54 UTC 2011 - coolo@suse.com @@ -664,7 +674,7 @@ Fri Dec 2 01:59:16 CET 2011 - dmueller@suse.de ------------------------------------------------------------------- Wed Nov 30 12:26:42 UTC 2011 - idoenmez@suse.de -- Fix build with Qt 4.8 +- Fix build with Qt 4.8 ------------------------------------------------------------------- Wed Nov 2 20:23:51 CET 2011 - dmueller@suse.de @@ -689,7 +699,7 @@ Fri Sep 23 10:05:22 UTC 2011 - idonmez@suse.com - lokalize should depend on kdesdk4-strigi now that kdesdk4 base package is gone. -------------------------------------------------------------------- +------------------------------------------------------------------- Thu Sep 17 14:02:01 UTC 2011 - toddrme2178@gmail.com - Split kompare-devel package (fix for RPMLINT warning) @@ -721,12 +731,12 @@ Fri Jul 22 20:21:45 CEST 2011 - dmueller@suse.de - update to 4.7.0 * Small fixes over KDE 4.7 RC2 * see http://kde.org/announcements/4.7 for details - + ------------------------------------------------------------------- Thu Jul 21 13:04:05 UTC 2011 - idonmez@novell.com -- Update to 4.6.95 +- Update to 4.6.95 ------------------------------------------------------------------- Fri Jul 1 11:21:10 CEST 2011 - dmueller@suse.de @@ -734,7 +744,7 @@ Fri Jul 1 11:21:10 CEST 2011 - dmueller@suse.de - update to 4.6.5 * Bugfixes over KDE 4.6.5 * see http://kde.org/announcements/changelogs/changelog4_6_4to4_6_5.php for details - + ------------------------------------------------------------------- Fri Jun 3 15:38:26 CEST 2011 - dmueller@suse.de @@ -742,7 +752,7 @@ Fri Jun 3 15:38:26 CEST 2011 - dmueller@suse.de - update to 4.6.4 * Bugfixes over KDE 4.6.3 * see http://kde.org/announcements/changelogs/changelog4_6_3to4_6_4.php for details - + ------------------------------------------------------------------- Thu Apr 28 16:16:04 CEST 2011 - dmueller@suse.de @@ -750,7 +760,7 @@ Thu Apr 28 16:16:04 CEST 2011 - dmueller@suse.de - update to 4.6.3 * Bugfixes over KDE 4.6.2 * see http://kde.org/announcements/changelogs/changelog4_6_2to4_6_3.php for details - + ------------------------------------------------------------------- Fri Apr 1 15:17:36 CEST 2011 - dmueller@suse.de @@ -758,7 +768,7 @@ Fri Apr 1 15:17:36 CEST 2011 - dmueller@suse.de - update to 4.6.2 * Bugfixes over KDE 4.6.1 * see http://kde.org/announcements/changelogs/changelog4_6_1to4_6_2.php for details - + ------------------------------------------------------------------- Tue Mar 8 14:10:17 CET 2011 - dmueller@suse.de @@ -766,7 +776,7 @@ Tue Mar 8 14:10:17 CET 2011 - dmueller@suse.de - update to 4.6.1 * Bugfixes over KDE 4.6.0 * see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for details - + ------------------------------------------------------------------- Thu Feb 17 14:21:18 UTC 2011 - wstephenson@novell.com @@ -1272,17 +1282,17 @@ Thu Nov 1 12:21:39 CET 2007 - dmueller@suse.de ------------------------------------------------------------------- Wed Oct 31 23:39:16 CET 2007 - dmueller@suse.de -- update to KDE 4.0 Beta4 +- update to KDE 4.0 Beta4 ------------------------------------------------------------------- Sat Oct 20 17:58:01 CEST 2007 - dmueller@suse.de -- update to 3.94.1 +- update to 3.94.1 ------------------------------------------------------------------- Thu Oct 11 11:39:13 CEST 2007 - dmueller@suse.de -- udpate to KDE 4.0 Beta3 +- udpate to KDE 4.0 Beta3 ------------------------------------------------------------------- Tue Oct 2 16:10:31 CEST 2007 - stbinner@suse.de diff --git a/umbrello.spec b/umbrello.spec index 40f3d3b..b7e1936 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -1,7 +1,7 @@ # # spec file for package umbrello # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,56 +17,90 @@ Name: umbrello -BuildRequires: libkde4-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel +Version: 17.03.80 +Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.12.3 -Release: 0 Source0: %{name}-%{version}.tar.xz +BuildRequires: boost-devel +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kauth-devel +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kdoctools-devel +BuildRequires: kguiaddons-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kinit-devel +BuildRequires: kio-devel +BuildRequires: kparts-devel +BuildRequires: kservice-devel +BuildRequires: ktexteditor-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: kxmlgui-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +BuildRequires: pkgconfig +BuildRequires: subversion-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +Obsoletes: umbrello5 < %{version} +Provides: umbrello5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Umbrello is a UML modelling application. %prep -%setup -q -n %{name}-%{version} +%setup -q %build %ifarch ppc64 -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" -export CFLAGS="$RPM_OPT_FLAGS -fPIC" - %cmake_kde4 -d build +export CXXFLAGS="%{optflags} -fPIC" +export CFLAGS="%{optflags} -fPIC" + + %cmake_kf5 -d build -- -DBUILD_KF5=ON %make_jobs %install - %kde4_makeinstall -C build - %suse_update_desktop_file umbrello Development Design - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.umbrello Development Design %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig -%clean - rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_bindir}/umbrello -%{_kde4_bindir}/po2xmi -%{_kde4_bindir}/xmi2pot -%{_kde4_applicationsdir}/umbrello.desktop -%{_kde4_htmldir}/en/umbrello -%{_kde4_iconsdir}/hicolor/*/apps/umbrello.* -%{_kde4_iconsdir}/hicolor/*/mimetypes/application-x-uml.* -%{_kde4_appsdir}/umbrello/ +%{_kf5_bindir}/umbrello +%{_kf5_applicationsdir}/org.kde.umbrello.desktop +%{_kf5_htmldir}/en/umbrello +%{_kf5_sharedir}/umbrello/ +%{_kf5_bindir}/po2xmi +%{_kf5_bindir}/xmi2pot +%{_kf5_iconsdir}/hicolor/*/*/umbrello* +%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-uml.png +# %_kf5_kxmlguidir/umbrello/ +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.umbrello.appdata.xml %changelog From 77f3325901a7bdfbf43b6f3ba1cceb58b4ad72d765611021bfcd0b1bf5d08b9b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 26 Mar 2017 17:54:20 +0000 Subject: [PATCH 02/12] - 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 +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 +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 "umbrello" "umbrello5" 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 From d2e8301e8ad8ae55ac7e6e4373b3dc082abf14bfedcb2fe3e671056f983c4dd9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 26 Mar 2017 18:03:36 +0000 Subject: [PATCH 03/12] Apparently the desktop file name did change, contrary to the appstream metainfo. OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=52 --- umbrello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbrello.spec b/umbrello.spec index 95f1dca..19d6619 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -89,7 +89,7 @@ export CFLAGS="%{optflags} -fPIC" %install %kf5_makeinstall -C build - %suse_update_desktop_file org.kde.umbrello Development Design + %suse_update_desktop_file org.kde.umbrello5 Development Design %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From c8d1865766493d40f0a25687cafa142db4327d9450d3737bbb98d95d6aef7cd7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 26 Mar 2017 18:09:23 +0000 Subject: [PATCH 04/12] Adjust filelist accordingly OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=53 --- umbrello.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/umbrello.spec b/umbrello.spec index 19d6619..dd8a10f 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -97,12 +97,12 @@ export CFLAGS="%{optflags} -fPIC" %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kf5_bindir}/umbrello -%{_kf5_applicationsdir}/org.kde.umbrello.desktop +{_kf5_bindir}/umbrello5 +%{_kf5_applicationsdir}/org.kde.umbrello5.desktop %{_kf5_htmldir}/en/umbrello -%{_kf5_sharedir}/umbrello/ -%{_kf5_bindir}/po2xmi -%{_kf5_bindir}/xmi2pot +%{_kf5_sharedir}/umbrello5/ +%{_kf5_bindir}/po2xmi5 +%{_kf5_bindir}/xmi2pot5 %{_kf5_iconsdir}/hicolor/*/*/umbrello* %{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-uml.png # %_kf5_kxmlguidir/umbrello/ From 1035b9b91976e977e37e14818a3052966ffee2d30a81fc33f8361b532aab8a45 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 26 Mar 2017 19:23:15 +0000 Subject: [PATCH 05/12] Fix vanished % OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=54 --- umbrello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbrello.spec b/umbrello.spec index dd8a10f..9a39a3e 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -97,7 +97,7 @@ export CFLAGS="%{optflags} -fPIC" %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -{_kf5_bindir}/umbrello5 +%{_kf5_bindir}/umbrello5 %{_kf5_applicationsdir}/org.kde.umbrello5.desktop %{_kf5_htmldir}/en/umbrello %{_kf5_sharedir}/umbrello5/ From 3f569a80b7131ab2c830d22ae535b88e5abd96565f6fb19da0cdb57478303b3c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:56:37 +0000 Subject: [PATCH 06/12] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=55 --- umbrello-17.03.80.tar.xz | 3 --- umbrello-17.03.90.tar.xz | 3 +++ umbrello.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 umbrello-17.03.80.tar.xz create mode 100644 umbrello-17.03.90.tar.xz diff --git a/umbrello-17.03.80.tar.xz b/umbrello-17.03.80.tar.xz deleted file mode 100644 index 51d8cf6..0000000 --- a/umbrello-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcad5e45a1b7d61f4d13eec708fde6be3398c44dde21192777045a1fd87d0323 -size 1647476 diff --git a/umbrello-17.03.90.tar.xz b/umbrello-17.03.90.tar.xz new file mode 100644 index 0000000..12b8cb6 --- /dev/null +++ b/umbrello-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d674f6a588076807ef6d4723a98978d14988e88e071051db715462389000836 +size 1647404 diff --git a/umbrello.spec b/umbrello.spec index 9a39a3e..8e3404f 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -17,7 +17,7 @@ Name: umbrello -Version: 17.03.80 +Version: 17.03.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From e95e8a31d89af82845bbf10c8c35de175f82240fccf1c9a8c214d48a730be4de Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:49:48 +0000 Subject: [PATCH 07/12] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=56 --- umbrello.changes | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/umbrello.changes b/umbrello.changes index ab721c5..1bd96cc 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Apr 12 20:26:14 CEST 2017 - lbeltrame@kde.org + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * release-windows-packages: Do not create ticket with 'all' command + * 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'. + ------------------------------------------------------------------- Sat Mar 25 23:10:58 CET 2017 - lbeltrame@kde.org From db83c9473e9cd901fec7c08f701bf52f9dce33cf381614815648e4c5a46b1142 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:29:13 +0000 Subject: [PATCH 08/12] 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 -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 -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 "umbrello" "umbrello5" 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 From 48c179db5def0a9a20a6930801de0accc8922deebe7c51ae74f52137c9bc7003 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 14:07:16 +0000 Subject: [PATCH 09/12] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=58 --- umbrello-17.03.90.tar.xz | 3 --- umbrello-17.04.0.tar.xz | 3 +++ umbrello.changes | 10 ++++++++++ umbrello.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 umbrello-17.03.90.tar.xz create mode 100644 umbrello-17.04.0.tar.xz diff --git a/umbrello-17.03.90.tar.xz b/umbrello-17.03.90.tar.xz deleted file mode 100644 index 12b8cb6..0000000 --- a/umbrello-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d674f6a588076807ef6d4723a98978d14988e88e071051db715462389000836 -size 1647404 diff --git a/umbrello-17.04.0.tar.xz b/umbrello-17.04.0.tar.xz new file mode 100644 index 0000000..d6c7e01 --- /dev/null +++ b/umbrello-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6fde01d10016efd12e9bcb547c3a375124a7f6cde7b2be6b5c40f4526ce6a36 +size 1646936 diff --git a/umbrello.changes b/umbrello.changes index d4affb4..b8cf049 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 16 10:45:38 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * Fix crash on importing empty lines. + ------------------------------------------------------------------- Wed Apr 12 20:26:14 CEST 2017 - lbeltrame@kde.org diff --git a/umbrello.spec b/umbrello.spec index f907aee..81c9793 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -16,7 +16,7 @@ # Name: umbrello -Version: 17.03.90 +Version: 17.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From c6f6670b513556dac41193a04a0bebf0c46bfd1179a0d8171fd04460b37a0802 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 19:29:56 +0000 Subject: [PATCH 10/12] Temporarily remove URLs to bypass validation OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=59 --- umbrello.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/umbrello.spec b/umbrello.spec index 81c9793..5a18662 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -12,7 +12,7 @@ # 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 # Name: umbrello @@ -24,7 +24,7 @@ Release: 0 Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other -Url: http://www.kde.org/ +Url: Source0: %{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: extra-cmake-modules From 3eeed11a1c225e06636339e70c0a0f3c958be2ffb0a8d4885f4ab1c5ae5ee976 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 21:27:21 +0000 Subject: [PATCH 11/12] Fix empty URL tag OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=60 --- umbrello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbrello.spec b/umbrello.spec index 5a18662..734e7c1 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -24,7 +24,7 @@ Release: 0 Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other -Url: +Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: boost-devel BuildRequires: extra-cmake-modules From 3e92bb196b93ff4ee098f8f511fb6447d79cb467131e541e2d282876b28bd539 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:33:36 +0000 Subject: [PATCH 12/12] Add bug urls back OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=61 --- umbrello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbrello.spec b/umbrello.spec index 734e7c1..ff36816 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: umbrello