diff --git a/.gitignore b/.gitignore index 8bd9f0f..b94c308 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2 /gimp-2.8.20.tar.bz2 /gimp-2.8.22.tar.bz2 /gimp-2.10.0.tar.bz2 +/gimp-2.10.2.tar.bz2 diff --git a/gimp-2.10.0-gegl04.patch b/gimp-2.10.0-gegl04.patch deleted file mode 100644 index 30d408c..0000000 --- a/gimp-2.10.0-gegl04.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7e19906827d301eb70275dba089849a632a0eabe Mon Sep 17 00:00:00 2001 -From: Jehan -Date: Sat, 28 Apr 2018 00:27:31 +0200 -Subject: [PATCH] gimp.pc: Fix reference to gegl-0.3. - ---- - gimp.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gimp.pc.in b/gimp.pc.in -index 9cf1da9557..9acf6cae88 100644 ---- a/gimp.pc.in -+++ b/gimp.pc.in -@@ -12,6 +12,6 @@ gimplocaledir=@gimplocaledir@ - Name: GIMP - Description: GIMP Library - Version: @GIMP_REAL_VERSION@ --Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.3 >= @GEGL_REQUIRED_VERSION@ -+Requires: gdk-pixbuf-2.0 >= @GDK_PIXBUF_REQUIRED_VERSION@ cairo >= @CAIRO_REQUIRED_VERSION@ gegl-0.4 >= @GEGL_REQUIRED_VERSION@ - Libs: -L${libdir} -lgimp-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpconfig-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ @RT_LIBS@ - Cflags: -I${includedir}/gimp-@GIMP_API_VERSION@ --- -2.17.0 - diff --git a/gimp.spec b/gimp.spec index 60d4d3d..cd3f090 100644 --- a/gimp.spec +++ b/gimp.spec @@ -60,8 +60,8 @@ Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 -Version: 2.10.0 -%global rel 4 +Version: 2.10.2 +%global rel 1 Release: %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist} # Compute some version related macros. @@ -192,10 +192,6 @@ Patch0: gimp-%{version}%{dashprerel}-git%{gitrev}.patch.bz2 # Fedora specific. Patch1: gimp-2.10.0-cm-system-monitor-profile-by-default.patch -# Don't let the GIMP pkg-config file require gegl-0.3. -# upstream commit 7e19906827d301eb70275dba089849a632a0eabe -Patch2: gimp-2.10.0-gegl04.patch - # use external help browser directly if help browser plug-in is not built Patch100: gimp-2.10.0-external-help-browser.patch @@ -288,8 +284,6 @@ EOF %patch1 -p1 -b .cm-system-monitor-profile-by-default -%patch2 -p1 -b .gegl04 - %if ! %{with helpbrowser} %patch100 -p1 -b .external-help-browser %endif @@ -664,6 +658,9 @@ make check %{?_smp_mflags} %endif %changelog +* Mon May 21 2018 Nils Philippsen - 2:2.10.2-1 +- version 2.10.2 + * Fri May 11 2018 Nils Philippsen - 2:2.10.0-4 - fix external-help-browser patch (thanks to Joel Barrios DueƱas) diff --git a/sources b/sources index 36d41b8..65f83ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimp-2.10.0.tar.bz2) = a87cf5b3604addcf9d5e50f3d9d1acbbce8ed9e2a025e19bda37ce941acb471fa5e0fe8f71a74671581fce47aaa36a11b94dd96621465168630b97209d0d02fa +SHA512 (gimp-2.10.2.tar.bz2) = 6e351294e018a9f879993700355bdf5f10bccc6862604ae1950c4d235d32cdfcd6a0195b37377819adeef53ab3d24f32ed1de60cba6bafe58608ed0906a6fbcf