From 5624a3fb7f5f0c93b5ebd354f692b2da56431f6895ae3576c5c99e4123215d88 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 16 Dec 2016 10:34:07 +0000 Subject: [PATCH 1/6] Accepting request 446490 from home:Vogtinator:branches:KDE:Extra Update to version 3.1.1 OBS-URL: https://build.opensuse.org/request/show/446490 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=30 --- krita-3.0.1.1.tar.gz | 3 --- krita-3.1.1.tar.gz | 3 +++ krita.changes | 18 +++++++++++++++++ krita.spec | 46 ++++++++++++++++++++++++++++---------------- 4 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 krita-3.0.1.1.tar.gz create mode 100644 krita-3.1.1.tar.gz diff --git a/krita-3.0.1.1.tar.gz b/krita-3.0.1.1.tar.gz deleted file mode 100644 index 881a891..0000000 --- a/krita-3.0.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b36ce546fd5a469485496171add94c0deda3c26bdb7a688b7d593f5155baa86c -size 206390786 diff --git a/krita-3.1.1.tar.gz b/krita-3.1.1.tar.gz new file mode 100644 index 0000000..fd4dad7 --- /dev/null +++ b/krita-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f +size 209529508 diff --git a/krita.changes b/krita.changes index 534a5d5..bdba062 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Dec 15 16:26:07 UTC 2016 - fabian@ritter-vogt.de + +- Sync with KUE: + * Add -devel subpackage + * Use %bcond_without lang + * Don't remove non-existing color schemes any more +- Require Qt 5.6 +- Update to version 3.1.1: + * Full Support for OSX + * Render Animations to files + * Animation Curves and Opacity + * New Internal Color Picker + * New Quick Brush Engine + * Stop-Based Gradient Editor + * Lazy Brush/Colorize Mask + * More information on https://krita.org/en/release-notes-for-krita-3-1/ + ------------------------------------------------------------------- Sun Nov 6 17:05:13 UTC 2016 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index 70d14f1..a7bebcb 100644 --- a/krita.spec +++ b/krita.spec @@ -15,8 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%bcond_without lang + Name: krita -Version: 3.0.1.1 +Version: 3.1.1 Release: 0 Summary: Digital Painting Application License: GPL-2.0+ and LGPL-2.1+ @@ -64,7 +67,7 @@ BuildRequires: perl BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Core) >= 5.6 BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) @@ -88,7 +91,9 @@ BuildRequires: pkgconfig(xi) >= 1.4.99.1 BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xorg-macros) >= 1.3 BuildRequires: pkgconfig(xrandr) +%if %{with lang} Recommends: %{name}-lang = %{version} +%endif Recommends: create-resources %if %{suse_version} > 1320 || 0%{?is_opensuse} Obsoletes: calligra-krita < %{version} @@ -105,7 +110,18 @@ It is made by artists that want to see affordable art tools for everyone. * texture and matte painters * illustrations and comics +%package devel +Summary: Krita Build Environment +Group: Development/Libraries/KDE +Requires: %{name} = %{version} +Conflicts: calligra-devel + +%description devel +Development headers and libraries for Krita. + +%if %{with lang} %lang_package +%endif %prep %setup -q -n krita-%{version} @@ -116,7 +132,6 @@ FAKE_TIME=$(LC_ALL=C date -u -r %{SOURCE99} '+%%H:%%M') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h - %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... @@ -129,19 +144,6 @@ sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop -#Remove unwanted development files - -for i in image libpaintop store libbrush version undo2 odf color ui text plugin widgetutils pigment textlayout vectorimage flake basicflakes global widgets psd -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 @@ -153,23 +155,33 @@ done %{_kf5_applicationsdir}/*.desktop %{_kf5_sharedir}/krita/ %{_kf5_appstreamdir}/ +%{_kf5_libdir}/libkrita*.so.* %{_kf5_libdir}/kritaplugins/ %{_kf5_libdir}/libkritacolord.so %{_kf5_sharedir}/kritaplugins/ %{_kf5_sharedir}/color/ %{_kf5_sharedir}/color-schemes/ %{_kf5_iconsdir}/hicolor/*/apps/calligrakrita.* -%{_kf5_libdir}/libkrita*.so.* +%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-krita.png %dir %{_kf5_iconsdir}/hicolor/1024x1024 %dir %{_kf5_iconsdir}/hicolor/1024x1024/apps +%dir %{_kf5_iconsdir}/hicolor/1024x1024/mimetypes %dir %{_kf5_iconsdir}/hicolor/256x256 %dir %{_kf5_iconsdir}/hicolor/256x256/apps +%dir %{_kf5_iconsdir}/hicolor/256x256/mimetypes %dir %{_kf5_iconsdir}/hicolor/512x512 %dir %{_kf5_iconsdir}/hicolor/512x512/apps +%dir %{_kf5_iconsdir}/hicolor/512x512/mimetypes %config %{_kf5_configdir}/krita* +%files devel +%{_kf5_libdir}/libkrita*.so +%exclude %{_kf5_libdir}/libkritacolord.so + +%if %{with lang} %files lang %defattr(-,root,root,-) %{_kf5_localedir} +%endif %changelog From 0c9675db80cfc0f68ce196a839823178e482c18afb6cd8ae8b5d618f3936ba29 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 19 Dec 2016 21:38:22 +0000 Subject: [PATCH 2/6] Accepting request 446942 from home:wolfi323:branches:KDE:Extra - Move libkritacolord.so to the -devel subpackage where it belongs The runtime lib is correctly versioned now and installed as libkritacolord.so.16 OBS-URL: https://build.opensuse.org/request/show/446942 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=31 --- krita.changes | 5 +++++ krita.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/krita.changes b/krita.changes index bdba062..5ba08ce 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 18 17:06:50 UTC 2016 - wbauer@tmo.at + +- Move libkritacolord.so to the -devel subpackage where it belongs + ------------------------------------------------------------------- Thu Dec 15 16:26:07 UTC 2016 - fabian@ritter-vogt.de diff --git a/krita.spec b/krita.spec index a7bebcb..134346d 100644 --- a/krita.spec +++ b/krita.spec @@ -157,7 +157,6 @@ chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop %{_kf5_appstreamdir}/ %{_kf5_libdir}/libkrita*.so.* %{_kf5_libdir}/kritaplugins/ -%{_kf5_libdir}/libkritacolord.so %{_kf5_sharedir}/kritaplugins/ %{_kf5_sharedir}/color/ %{_kf5_sharedir}/color-schemes/ @@ -176,7 +175,6 @@ chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop %files devel %{_kf5_libdir}/libkrita*.so -%exclude %{_kf5_libdir}/libkritacolord.so %if %{with lang} %files lang From 31239c10278ecd49d344d2c7383c8b8dc43a47fd6f135a6de39b56d3ee0b0a86 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 21 Dec 2016 19:32:18 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=32 --- krita.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krita.spec b/krita.spec index 134346d..1fcb858 100644 --- a/krita.spec +++ b/krita.spec @@ -115,6 +115,8 @@ Summary: Krita Build Environment Group: Development/Libraries/KDE Requires: %{name} = %{version} Conflicts: calligra-devel +# /usr/lib64/libkritacolord.so is not versioned correctly, so not part of calligra-devel... +Conflicts: calligra-krita %description devel Development headers and libraries for Krita. From 999b82e2595e21b12e5e97c7fa42f29e3aef7ee89cb1990273b902530dfa7816 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 21 Dec 2016 19:32:46 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=33 --- krita.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/krita.changes b/krita.changes index 5ba08ce..e393242 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 21 19:32:18 UTC 2016 - fabian@ritter-vogt.de + +- Add Conflicts: calligra-krita to krita-devel due to + /usr/lib64/libkritacolord.so + ------------------------------------------------------------------- Sun Dec 18 17:06:50 UTC 2016 - wbauer@tmo.at From 0ca8a5ecc17a33fc4b169c849ac718e9de8c6efd6c43f483e71e78a7a0605999 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 21 Dec 2016 19:38:37 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=34 --- krita.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krita.spec b/krita.spec index 1fcb858..7b6c2d5 100644 --- a/krita.spec +++ b/krita.spec @@ -115,8 +115,6 @@ Summary: Krita Build Environment Group: Development/Libraries/KDE Requires: %{name} = %{version} Conflicts: calligra-devel -# /usr/lib64/libkritacolord.so is not versioned correctly, so not part of calligra-devel... -Conflicts: calligra-krita %description devel Development headers and libraries for Krita. @@ -145,6 +143,8 @@ sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h %suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop +# Otherwise the devel package conflicts with calligra-krita, where it is *not* a devel file... +rm %{buildroot}/%{_kf5_libdir}/libkritacolord.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From b471b0e9af7a8b0fe4f2e9e5bd7af59cafdbb99b966fedc897c8c8f21a81de17 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 21 Dec 2016 19:39:13 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=35 --- krita.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krita.changes b/krita.changes index e393242..eddceb9 100644 --- a/krita.changes +++ b/krita.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed Dec 21 19:32:18 UTC 2016 - fabian@ritter-vogt.de -- Add Conflicts: calligra-krita to krita-devel due to - /usr/lib64/libkritacolord.so +- Delete /usr/lib64/libkritacolord.so do to conflict between + calligra-krita and krita-devel ------------------------------------------------------------------- Sun Dec 18 17:06:50 UTC 2016 - wbauer@tmo.at