Accepting request 490552 from KDE:Applications

KDE Applications 17.04.0 final

OBS-URL: https://build.opensuse.org/request/show/490552
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/umbrello?expand=0&rev=50

umbrello-16.12.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94813479532c69336d642ff215059172d2054aa90a0a7050d73b5c01ab8392a8
-size 1636740

umbrello-17.04.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6fde01d10016efd12e9bcb547c3a375124a7f6cde7b2be6b5c40f4526ce6a36
+size 1646936

umbrello.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+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
+
+- 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'.
+- 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
+
+- 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
+- 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
 

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
@@ -15,58 +15,91 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           umbrello
-BuildRequires:  libkde4-devel
+Version:        17.04.0
-BuildRequires:  libxml2-devel
+Release:        0
-BuildRequires:  libxslt-devel
+%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/
+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 CXXFLAGS="%{optflags} -fPIC"
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="%{optflags} -fPIC"
-  %cmake_kde4 -d build
+
+  %cmake_kf5 -d build -- -DBUILD_KF5=ON
   %make_jobs
 
 %install
-  %kde4_makeinstall -C build
+  %kf5_makeinstall -C build
-  %suse_update_desktop_file    umbrello       Development Design
+  %suse_update_desktop_file    org.kde.umbrello5       Development Design
-  %kde_post_install
 
 %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
+%{_kf5_bindir}/umbrello5
-%{_kde4_bindir}/po2xmi
+%{_kf5_applicationsdir}/org.kde.umbrello5.desktop
-%{_kde4_bindir}/xmi2pot
+%{_kf5_htmldir}/en/umbrello
-%{_kde4_applicationsdir}/umbrello.desktop
+%{_kf5_sharedir}/umbrello5/
-%{_kde4_htmldir}/en/umbrello
+%{_kf5_bindir}/po2xmi5
-%{_kde4_iconsdir}/hicolor/*/apps/umbrello.*
+%{_kf5_bindir}/xmi2pot5
-%{_kde4_iconsdir}/hicolor/*/mimetypes/application-x-uml.*
+%{_kf5_iconsdir}/hicolor/*/*/umbrello*
-%{_kde4_appsdir}/umbrello/
+%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-uml.png
+# %_kf5_kxmlguidir/umbrello/
+%dir %{_kf5_appstreamdir}
+%{_kf5_appstreamdir}/org.kde.umbrello.appdata.xml
 
 %changelog