Accepting request 563455 from graphics

OBS-URL: https://build.opensuse.org/request/show/563455
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=100

gimp.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Jan  7 13:50:15 UTC 2018 - zaitor@opensuse.org
+
+- Run spec-cleaner, modernize spec, drop Obsoletes for versions
+  no longer supported.
+
+-------------------------------------------------------------------
+Sat Jan  6 04:13:05 UTC 2018 - plinnell@opensuse.org
+
+- Don't build with webkit1, as it is no longer maintained and has
+  plenty of security bugs.  This disables the GIMP's built-in help
+  browser; it will use an external browser when configured this way.
+
+  This works around a number of security vulnerabilities in Webkit1:
+
+  https://bugzilla.suse.com/show_bug.cgi?id=923223
+  https://bugzilla.suse.com/show_bug.cgi?id=906375
+  https://bugzilla.suse.com/show_bug.cgi?id=906374
+  https://bugzilla.suse.com/show_bug.cgi?id=906373
+  https://bugzilla.suse.com/show_bug.cgi?id=1034856
+  https://bugzilla.suse.com/show_bug.cgi?id=871792
+  https://bugzilla.suse.com/show_bug.cgi?id=879607
+  https://bugzilla.suse.com/show_bug.cgi?id=892084
+
 -------------------------------------------------------------------
 Wed May 31 04:59:00 UTC 2017 - plinnell@opensuse.org
 

gimp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gimp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,13 @@ Release:        0
 Summary:        The GNU Image Manipulation Program
 License:        GPL-3.0+
 Group:          Productivity/Graphics/Bitmap Editors
-Url:            http://www.gimp.org/
+URL:            http://www.gimp.org/
 Source:         http://download.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
 Source1:        macros.gimp
-
 # openSUSE palette file
 Source2:        openSUSE.gpl
 Source99:       baselibs.conf
+
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel >= 1.0.0
 BuildRequires:  fdupes
@@ -46,11 +46,10 @@ BuildRequires:  libbz2-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
+BuildRequires:  librsvg-devel >= 2.36.0
 BuildRequires:  libtiff-devel
-%if 0%{?suse_version} < 1330
-BuildRequires:  libwebkit-devel >= 1.6.1
-%endif
 BuildRequires:  libwmf-devel >= 0.2.8
+BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig
 BuildRequires:  python-gtk-devel >= 2.10.4
 BuildRequires:  translation-update-upstream
@@ -68,7 +67,6 @@ BuildRequires:  pkgconfig(gudev-1.0) >= 167
 BuildRequires:  pkgconfig(lcms2) >= 2.2
 BuildRequires:  pkgconfig(libexif) >= 0.6.15
 BuildRequires:  pkgconfig(libpng) >= 1.2.37
-
 BuildRequires:  pkgconfig(pango) >= 1.29.4
 BuildRequires:  pkgconfig(poppler-glib) >= 0.12.4
 BuildRequires:  pkgconfig(xcursor)
@@ -81,38 +79,16 @@ BuildRequires:  pkgconfig(zlib)
 # Explicitly declare the libgimp versions for upgrade purposes
 Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
-%if 0%{?suse_version} < 1330
-Recommends:     %{name}-help-browser
-%else
-# Obsolete gimp-help browser for versions newer than 1330
-Obsoletes:      %{name}-help-browser
-%endif
 Recommends:     %{name}-lang
 Recommends:     %{name}-plugins-python = %{version}
 Recommends:     iso-codes
 Suggests:       AdobeICCProfiles
 Suggests:       gimp-2.0-scanner-plugin
-# With openSUSE 13.1, we started shipping gimp unbranded
+Obsoletes:      %{name}-help-browser
-Obsoletes:      %{name}-branding
+
 Provides:       gimp-2.0 = %{version}
 Provides:       gimp(abi) = %{abiver}
 Provides:       gimp(api) = %{apiver}
-Obsoletes:      gimp-unstable < 2.6.0
-# Obsolete hal subpackage which we had until 11.4.
-Obsoletes:      %{name}-module-hal < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} < 1220
-# best-effort attempt to use librsvg (file-svg plugin will be built
-# if recent-enough version of librsvg is there)
-BuildRequires:  librsvg-devel
-%else
-BuildRequires:  librsvg-devel >= 2.36.0
-%endif
-%if 0%{?suse_version} < 1220
-BuildRequires:  libxslt-devel
-%else
-BuildRequires:  libxslt-tools
-%endif
 
 %description
 The GIMP is an image composition and editing program, which can be
@@ -155,7 +131,6 @@ Provides:       gimp-2.0-plugins-python = %{version}
 Obsoletes:      gimp-unstable-plugins-python < 2.6.0
 # For update from <= 10.3 and SLED 10:
 Provides:       %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version}
-%py_requires
 
 %description plugins-python
 The GIMP is an image composition and editing program. GIMP offers
@@ -192,17 +167,6 @@ toolbox and scripting.
 This subpackage contains libraries and header files for developing
 applications that want to make use of the GIMP libraries.
 
-%if 0%{?suse_version} < 1330
-%package help-browser
-Summary:        The GNU Image Manipulation Program - Help Browser
-Group:          Productivity/Graphics/Bitmap Editors
-Requires:       %{name} = %{version}
-Supplements:    packageand(%{name}:gimp-help)
-
-%description help-browser
-This package contains the help browser for the GIMP.
-%endif
-
 %lang_package
 
 %prep
@@ -235,6 +199,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 	--disable-static\
 %if 0%{?suse_version} >= 1330
 	--without-webkit\
+	--with-lcms=lcms2\
 %endif
 	--libexecdir=%{_prefix}/lib\
 	--enable-default-binary\
@@ -287,15 +252,12 @@ install -m 644 -c macros.gimp \
 
 %post -n libgimp-2_0-0 -p /sbin/ldconfig
 %postun -n libgimp-2_0-0 -p /sbin/ldconfig
+
 %post -n libgimpui-2_0-0 -p /sbin/ldconfig
 %postun -n libgimpui-2_0-0 -p /sbin/ldconfig
 
 %files -f plugins.list
-%defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog LICENSE NEWS* README
-%if 0%{?suse_version} < 1330
-%exclude %{_libdir}/gimp/2.0/plug-ins/help-browser
-%endif
 %{_bindir}/gimp
 %{_bindir}/gimp-2.?
 %{_bindir}/gimp-console
@@ -332,11 +294,9 @@ install -m 644 -c macros.gimp \
 %exclude %{_libdir}/gimp/2.0/plug-ins/file-aa
 
 %files plugin-aa
-%defattr(-,root,root)
 %{_libdir}/gimp/2.0/plug-ins/file-aa
 
 %files -n libgimp-2_0-0
-%defattr(-,root,root)
 %dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/2.0
 %dir %{_libdir}/gimp
@@ -353,30 +313,19 @@ install -m 644 -c macros.gimp \
 %{_libdir}/libgimpmodule-2.0.so.*
 
 %files -n libgimpui-2_0-0
-%defattr(-,root,root)
 %{_libdir}/libgimpthumb-2.0.so.*
 %{_libdir}/libgimpui-2.0.so.*
 %{_libdir}/libgimpwidgets-2.0.so.*
 
-%if 0%{?suse_version} < 1330
-%files help-browser
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog LICENSE NEWS* README
-%{_libdir}/gimp/2.0/plug-ins/help-browser
-%endif
-
 %files plugins-python -f plugins-python.list
-%defattr(-,root,root)
 %{_libdir}/gimp/2.0/environ/pygimp.env
 %{_libdir}/gimp/2.0/interpreters/pygimp.interp
 %{_libdir}/gimp/2.0/python/
 # FIXME: Maybe split gimp-lang and gimp-plugins-python-lang
 
 %files lang -f gimp20.lang
-%defattr(-,root,root)
 
 %files devel
-%defattr(-,root,root)
 %doc README.i18n
 %{_bindir}/gimptool-2.0
 %doc %{_mandir}/man?/gimptool-2.0.*