From 2d7d284dec73785259893c9e78fd47886a119d958cb858b3c902310d4b858096 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 8 Sep 2016 14:05:09 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=21 --- krita-3.0.tgz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 krita-3.0.tgz diff --git a/krita-3.0.tgz b/krita-3.0.tgz deleted file mode 100644 index c98cae1..0000000 --- a/krita-3.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a -size 193020370 From 4b629af4c5ba3f1fee18a260eff4304a2958d5b870721fc76a4cafb526293527 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 8 Sep 2016 14:06:19 +0000 Subject: [PATCH 2/4] revert OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=22 --- krita-3.0.tgz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 krita-3.0.tgz diff --git a/krita-3.0.tgz b/krita-3.0.tgz new file mode 100644 index 0000000..c98cae1 --- /dev/null +++ b/krita-3.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a +size 193020370 From 3906c65e65281d7179292fca2798956a4d6de8c9ffdfcd5a74dbcd0afddc8b23 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 9 Sep 2016 17:14:51 +0000 Subject: [PATCH 3/4] Accepting request 426181 from home:wolfi323:branches:KDE:Extra - Update to version 3.0.1 - Add lang subpackage OBS-URL: https://build.opensuse.org/request/show/426181 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=23 --- krita-3.0.1.tar.gz | 3 +++ krita-3.0.tgz | 3 --- krita.changes | 10 ++++++++++ krita.spec | 19 ++++++++++++++----- 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 krita-3.0.1.tar.gz delete mode 100644 krita-3.0.tgz diff --git a/krita-3.0.1.tar.gz b/krita-3.0.1.tar.gz new file mode 100644 index 0000000..dfaf64d --- /dev/null +++ b/krita-3.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 +size 206137161 diff --git a/krita-3.0.tgz b/krita-3.0.tgz deleted file mode 100644 index c98cae1..0000000 --- a/krita-3.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a -size 193020370 diff --git a/krita.changes b/krita.changes index 8573aa6..bf14276 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 8 14:08:14 UTC 2016 - wbauer@tmo.at + +- Update to version 3.0.1 + + For a list of changes see: + https://krita.org/en/item/krita-3-0-1-update-brings-numerous-fixes/ + +- Add lang subpackage + ------------------------------------------------------------------- Thu Jul 21 16:58:30 UTC 2016 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index 1217fd5..3932d24 100644 --- a/krita.spec +++ b/krita.spec @@ -16,13 +16,13 @@ # Name: krita -Version: 3.0 +Version: 3.0.1 Release: 0 Summary: Image Manipulation Application License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Url: http://www.krita.org/ -Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tgz +Source0: http://files.kde.org/krita/3/source/krita-%{version}.tar.gz Source99: %{name}.changes BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel @@ -88,6 +88,7 @@ BuildRequires: pkgconfig(xi) >= 1.4.99.1 BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xorg-macros) >= 1.3 BuildRequires: pkgconfig(xrandr) +Recommends: %{name}-lang = %{version} Recommends: create-resources %if %{suse_version} > 1320 || 0%{?is_opensuse} Obsoletes: calligra-krita < %{version} @@ -100,6 +101,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Krita is the image manipulation application of the Calligra Suite. +%lang_package + %prep %setup -q -n krita-%{version} @@ -111,12 +114,14 @@ sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h %build -%cmake_kf5 -d build +# install translations to %{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based) +# can probably be changed back to the standard location when calligra is KF5 based... +%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build -%suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics +%suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop @@ -137,7 +142,7 @@ done %{_kf5_bindir}/gmicparser %{_kf5_applicationsdir}/*.desktop %{_kf5_sharedir}/krita/ -%{_kf5_sharedir}/appdata/ +%{_kf5_appstreamdir}/ %{_kf5_libdir}/kritaplugins/ %{_kf5_libdir}/libkritacolord.so %{_kf5_sharedir}/kritaplugins/ @@ -153,4 +158,8 @@ done %dir %{_kf5_iconsdir}/hicolor/512x512/apps %config %{_kf5_configdir}/krita* +%files lang +%defattr(-,root,root,-) +%{_kf5_localedir} + %changelog From 3e4228c0178689b418ba7418afdfb7b122133063623de2158a7c96a143232b22 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 10 Sep 2016 13:43:40 +0000 Subject: [PATCH 4/4] Accepting request 426199 from home:wolfi323:branches:KDE:Extra - Do not install the BreezeDark and BreezeHighContrast color schemes, they are already included in breeze5-style (kde#368093) OBS-URL: https://build.opensuse.org/request/show/426199 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=24 --- krita.changes | 6 ++++++ krita.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/krita.changes b/krita.changes index bf14276..48004c2 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 9 20:34:58 UTC 2016 - wbauer@tmo.at + +- Do not install the BreezeDark and BreezeHighContrast color + schemes, they are already included in breeze5-style (kde#368093) + ------------------------------------------------------------------- Thu Sep 8 14:08:14 UTC 2016 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index 3932d24..f83210a 100644 --- a/krita.spec +++ b/krita.spec @@ -132,6 +132,12 @@ do rm %{buildroot}%{_kf5_libdir}/libkrita${i}.so done +# remove color schemes that are already included in breeze5 (kde#368093) +for i in BreezeDark BreezeHighContrast +do + rm %{buildroot}/%{_kf5_sharedir}/color-schemes/${i}.colors +done + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig