Accepting request 426326 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/426326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krita?expand=0&rev=3

krita-3.0.1.tar.gz

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

krita-3.0.tgz

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

krita.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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
 
@@ -127,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
 
@@ -137,7 +148,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 +164,8 @@ done
 %dir %{_kf5_iconsdir}/hicolor/512x512/apps
 %config %{_kf5_configdir}/krita*
 
+%files lang
+%defattr(-,root,root,-)
+%{_kf5_localedir}
+
 %changelog