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

- Use the %kf5_find_lang macro to get the file list for the lang package
- 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

OBS-URL: https://build.opensuse.org/request/show/518115
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=49

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