diff --git a/Drop-QForeachContainer-include.patch b/Drop-QForeachContainer-include.patch deleted file mode 100644 index 26d7178..0000000 --- a/Drop-QForeachContainer-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -Date: Sat, 6 May 2017 16:00:21 +0200 -Subject: Drop QForeachContainer include and fix Qt 5.9 build - -It's not used anywhere. - -Acked by boud. ---- - libs/ui/KisResourceBundleManifest.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libs/ui/KisResourceBundleManifest.cpp b/libs/ui/KisResourceBundleManifest.cpp -index e4f94ca..8376165 100644 ---- a/libs/ui/KisResourceBundleManifest.cpp -+++ b/libs/ui/KisResourceBundleManifest.cpp -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - - #include - #include --- -cgit v0.11.2 - diff --git a/krita-3.1.4.tar.gz b/krita-3.1.4.tar.gz deleted file mode 100644 index a2e08f7..0000000 --- a/krita-3.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa -size 209778186 diff --git a/krita-3.2.0.tar.gz b/krita-3.2.0.tar.gz new file mode 100644 index 0000000..cb6254e --- /dev/null +++ b/krita-3.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 +size 207016115 diff --git a/krita.changes b/krita.changes index 5b50a4e..925b94e 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Aug 21 10:00:04 UTC 2017 - wbauer@tmo.at + +- Use the %kf5_find_lang macro to get the file list for the lang + package + +------------------------------------------------------------------- +Thu Aug 17 12:17:56 UTC 2017 - wbauer@tmo.at + +- Update to version 3.2.0: + * New G'Mic-qt plugin integration + * Smart patch tool + * Finger painting on touch screens + * New brush presets + * A lot of bug fixes + * See also https://krita.org/en/release-notes-for-krita-3-2/ +- Drop Drop-QForeachContainer-include.patch, merged upstream +- Remove build-compare workaround from the specfile, the + corresponding source file doesn't exist anymore + ------------------------------------------------------------------- Fri Jul 21 13:45:55 UTC 2017 - tchvatal@suse.com diff --git a/krita.spec b/krita.spec index e24f78e..aa31ac1 100644 --- a/krita.spec +++ b/krita.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: krita -Version: 3.1.4 +Version: 3.2.0 Release: 0 Summary: Digital Painting Application License: GPL-2.0+ and LGPL-2.1+ @@ -27,8 +27,6 @@ Group: Productivity/Graphics/Bitmap Editors Url: http://www.krita.org/ Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz Source99: %{name}.changes -# PATCH-FIX-UPSTREAM Drop-QForeachContainer-include.patch -- fixes build with Qt 5.9 -Patch: Drop-QForeachContainer-include.patch BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -128,16 +126,9 @@ Development headers and libraries for Krita. %prep %setup -q -n krita-%{version} -%patch -p1 - -# Remove build time references so build-compare can do its work -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y') -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) +# 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 @@ -145,6 +136,9 @@ sed -i "s/__TIME__/\"$FAKE_TIME\"/" plugins/extensions/gmic/3rdparty/gmic/CImg.h %install %kf5_makeinstall -C build %suse_update_desktop_file -r org.kde.krita Qt KDE Graphics RasterGraphics +%if %{with lang} +%kf5_find_lang %{name} +%endif chmod -x %{buildroot}/%{_kf5_applicationsdir}/*.desktop # Otherwise the devel package conflicts with calligra-krita, where it is *not* a devel file... @@ -157,7 +151,6 @@ rm %{buildroot}/%{_kf5_libdir}/libkritacolord.so %defattr(-,root,root,-) %doc COPYING* AUTHORS HACKING README* %{_kf5_bindir}/krita -%{_kf5_bindir}/gmicparser %{_kf5_applicationsdir}/*.desktop %{_kf5_sharedir}/krita/ %{_kf5_appstreamdir}/ @@ -183,9 +176,7 @@ rm %{buildroot}/%{_kf5_libdir}/libkritacolord.so %{_kf5_libdir}/libkrita*.so %if %{with lang} -%files lang -%defattr(-,root,root,-) -%{_kf5_localedir} +%files lang -f %{name}.lang %endif %changelog