rpm/krita
SHA256
1
0
Fork 0
forked from pool/krita
Code Pull Requests Activity

Accepting request 399511 from home:wolfi323:branches:KDE:Extra

Browse Source 
- No need to remove the kra and ora kimageformats plugins any more, they have been removed upstream (kde#359443)
- Do not build against Vc-devel-static on 13.2
- Conflict with calligra-krita, there are file overlaps (boo#968709)
- Mark /etc/xdg/kritarc as config file

OBS-URL: https://build.opensuse.org/request/show/399511
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=2
This commit is contained in:
Hrvoje Senjan 2016-06-01 15:51:04 +00:00 committed by Git OBS Bridge
parent 98536add30
commit 1106c1a7c5
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
krita.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jun 1 09:19:41 UTC 2016 - wbauer@tmo.at
- No need to remove the kra and ora kimageformats plugins any more,
they have been removed upstream (kde#359443)
- Do not build against Vc-devel-static on 13.2
- Conflict with calligra-krita, there are file overlaps (boo#968709)
- Mark /etc/xdg/kritarc as config file
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 1 07:20:43 UTC 2016 - adrian@suse.de Wed Jun 1 07:20:43 UTC 2016 - adrian@suse.de

10
krita.spec
View File

@ -27,7 +27,9 @@ Source0: http://ftp5.gwdg.de/pub/linux/kde/stable/krita/%{version}/krita-
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: OpenColorIO-devel BuildRequires: OpenColorIO-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
%if %{suse_version} != 1320
BuildRequires: Vc-devel-static BuildRequires: Vc-devel-static
%endif
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
@ -87,6 +89,7 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.3
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
Recommends: create-resources Recommends: create-resources
Recommends: libwacom2 Recommends: libwacom2
Conflicts: calligra-krita
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -96,6 +99,7 @@ Krita is the image manipulation application of the Calligra Suite.
Summary: Krita Build Environment Summary: Krita Build Environment
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Requires: %{name} = %{version} Requires: %{name} = %{version}
Conflicts: calligra-devel
%description devel %description devel
Development headers and libraries for Krita. Development headers and libraries for Krita.
@ -110,10 +114,6 @@ Development headers and libraries for Krita.
%install %install
%kf5_makeinstall -C build %kf5_makeinstall -C build
# This file is packaged also in kimageformats
rm -rf %{buildroot}%{_kf5_plugindir}/imageformats/kimg_kra.so
rm -rf %{buildroot}%{_kf5_plugindir}/imageformats/kimg_ora.so
%suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics %suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -139,7 +139,7 @@ rm -rf %{buildroot}%{_kf5_plugindir}/imageformats/kimg_ora.so
%dir %{_kf5_iconsdir}/hicolor/256x256/apps %dir %{_kf5_iconsdir}/hicolor/256x256/apps
%dir %{_kf5_iconsdir}/hicolor/512x512 %dir %{_kf5_iconsdir}/hicolor/512x512
%dir %{_kf5_iconsdir}/hicolor/512x512/apps %dir %{_kf5_iconsdir}/hicolor/512x512/apps
%{_kf5_configdir}/krita* %config %{_kf5_configdir}/krita*
%files devel %files devel
%{_kf5_libdir}/libkrita*.so %{_kf5_libdir}/libkrita*.so