From eec87c95fb27da111e7b8b364525d27d171757ad36d6cc7f1a1c589400927f30 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Sun, 13 Dec 2015 13:34:57 +0000 Subject: [PATCH 1/6] update to (15.12.0) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=22 --- umbrello-15.08.3.tar.xz | 3 --- umbrello-15.12.0.tar.xz | 3 +++ umbrello.changes | 9 +++++++++ umbrello.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 umbrello-15.08.3.tar.xz create mode 100644 umbrello-15.12.0.tar.xz diff --git a/umbrello-15.08.3.tar.xz b/umbrello-15.08.3.tar.xz deleted file mode 100644 index ad2abf8..0000000 --- a/umbrello-15.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf5f371657183a9c4aa878036f07b842433a86b2f9d9ae78886105ab0feb645e -size 1569380 diff --git a/umbrello-15.12.0.tar.xz b/umbrello-15.12.0.tar.xz new file mode 100644 index 0000000..c992ef3 --- /dev/null +++ b/umbrello-15.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c93de0aeccefbc0f98a215aa23fce30e8bef311ffd15211f1e7d63aa62c39326 +size 1570456 diff --git a/umbrello.changes b/umbrello.changes index ea42b86..5f0e936 100644 --- a/umbrello.changes +++ b/umbrello.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Dec 13 13:34:53 UTC 2015 - tittiatcoke@gmail.com + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + ------------------------------------------------------------------- Tue Nov 10 20:24:32 UTC 2015 - tittiatcoke@gmail.com diff --git a/umbrello.spec b/umbrello.spec index 2347473..31bc2f5 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -24,7 +24,7 @@ Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build From 8623443dca28e15c9b5c41906b0c10f6bef3e6389ea1521826d3d31a6dfb4b42 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Tue, 15 Dec 2015 19:14:01 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=23 --- umbrello.spec | 59 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/umbrello.spec b/umbrello.spec index 31bc2f5..871b377 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -17,9 +17,38 @@ Name: umbrello -BuildRequires: libkde4-devel +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: 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(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other @@ -28,7 +57,6 @@ Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Umbrello is a UML modelling application. @@ -42,13 +70,13 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC" - %cmake_kde4 -d build + + %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 @@ -60,13 +88,16 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC" %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 %_datadir/appdata +%_datadir/appdata/org.kde.umbrello.appdata.xml %changelog From dfee4c7304b0932902b3bc2a58590fa15d58c64f810607d5e635039b1d6b2412 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Tue, 15 Dec 2015 19:31:12 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=24 --- umbrello.spec | 61 +++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/umbrello.spec b/umbrello.spec index 871b377..2347473 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -17,46 +17,18 @@ Name: umbrello -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: libkde4-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel -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(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 15.12.0 +Version: 15.08.3 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +%kde4_runtime_requires %description Umbrello is a UML modelling application. @@ -70,13 +42,13 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC" - - %cmake_kf5 -d build -- -DBUILD_KF5=ON + %cmake_kde4 -d build %make_jobs %install - %kf5_makeinstall -C build - %suse_update_desktop_file org.kde.umbrello Development Design + %kde4_makeinstall -C build + %suse_update_desktop_file umbrello Development Design + %kde_post_install %post -p /sbin/ldconfig @@ -88,16 +60,13 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC" %files %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_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 %_datadir/appdata -%_datadir/appdata/org.kde.umbrello.appdata.xml +%{_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/ %changelog From de23b69a186fa7e11b9642de00535d358d255512b4980dc16721950304716e25 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Tue, 15 Dec 2015 19:31:29 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=25 --- umbrello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbrello.spec b/umbrello.spec index 2347473..31bc2f5 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -24,7 +24,7 @@ Summary: UML Modeller License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build From 6128555f25cd62a728339c3b25f642055c89da26cbcf2e4860d0b7d716020471 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Tue, 15 Dec 2015 20:06:18 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=26 --- umbrello.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/umbrello.spec b/umbrello.spec index 31bc2f5..935dae8 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -35,6 +35,10 @@ Umbrello is a UML modelling application. %prep %setup -q -n %{name}-%{version} +#Fix icons +cd umbrello/pics/global +for i in `ls *.png` do cp $i hi$i done +for i in `ls *.svgz` do cp $i hi$i done %build %ifarch ppc64 From 79cc1b11222be0c9519d0d49c61dd6858a53cdf4d3867aab33a03f8af34b432d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck <tittiatcoke@gmail.com> Date: Tue, 15 Dec 2015 20:18:16 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=27 --- umbrello.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/umbrello.spec b/umbrello.spec index 935dae8..a692248 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -37,8 +37,16 @@ Umbrello is a UML modelling application. %setup -q -n %{name}-%{version} #Fix icons cd umbrello/pics/global -for i in `ls *.png` do cp $i hi$i done -for i in `ls *.svgz` do cp $i hi$i done +mv 128-apps-umbrello.png hi128-apps-umbrello.png +mv 16-apps-umbrello.png hi16-apps-umbrello.png +mv 16-mimetypes-application-x-uml.png hi16-mimetypes-application-x-uml.png +mv 22-apps-umbrello.png hi22-apps-umbrello.png +mv 32-apps-umbrello.png hi32-apps-umbrello.png +mv 32-mimetypes-application-x-uml.png hi32-mimetypes-application-x-uml.png +mv 48-apps-umbrello.png hi48-apps-umbrello.png +mv 64-apps-umbrello.png hi64-apps-umbrello.png +mv sc-apps-umbrello.svgz hisc-apps-umbrello.svgz + %build %ifarch ppc64