From d4cbc0e4967da1bf4432fbed51845c8173a189a832a1d63bbcbc35f2206bb09e Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 19 Oct 2020 08:08:37 +0000
Subject: [PATCH] Accepting request 842398 from
 home:badshah400:branches:graphics

- Change macro defined to test whether to build python plugin from _with_python2 to _with_python_plugin since the complementary variable _without_python2 is already defined as `true` for openSUSE:Factory project wide (to disable building python2 modules when using single-spec); this re-enables the python plugin for openSUSE Tumbleweed.

OBS-URL: https://build.opensuse.org/request/show/842398
OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=47
---
 gimp.changes | 10 ++++++++++
 gimp.spec    | 16 +++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gimp.changes b/gimp.changes
index b1be17e..753ed11 100644
--- a/gimp.changes
+++ b/gimp.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Oct 18 14:04:36 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Change macro defined to test whether to build python plugin from
+  _with_python2 to _with_python_plugin since the complementary
+  variable _without_python2 is already defined as `true` for
+  openSUSE:Factory project wide (to disable building python2
+  modules when using single-spec); this re-enables the python
+  plugin for openSUSE Tumbleweed.
+
 -------------------------------------------------------------------
 Tue Oct  6 02:29:41 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/gimp.spec b/gimp.spec
index 660e94c..b286b3c 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -19,9 +19,9 @@
 %global abiver 4
 %global apiver 2.0
 %if 0%{?sle_version}
-%bcond_with python2
+%bcond_with python_plugin
 %else
-%bcond_without python2
+%bcond_without python_plugin
 %endif
 Name:           gimp
 Version:        2.10.22
@@ -64,7 +64,7 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig
-%if %{with python2}
+%if %{with python_plugin}
 BuildRequires:  python-gtk-devel >= 2.10.4
 %endif
 BuildRequires:  translation-update-upstream
@@ -107,7 +107,7 @@ Requires:       libgimp-2_0-0 = %{version}
 Requires:       libgimpui-2_0-0 = %{version}
 Requires:       xdg-utils
 Recommends:     %{name}-lang
-%if %{with python2}
+%if %{with python_plugin}
 Recommends:     %{name}-plugins-python = %{version}
 %endif
 Recommends:     iso-codes
@@ -151,7 +151,7 @@ toolbox and scripting.
 
 This package provides GIMP UI libraries.
 
-%if %{with python2}
+%if %{with python_plugin}
 %package plugins-python
 Summary:        The GNU Image Manipulation Program - python-gtk based plugins
 Group:          Productivity/Graphics/Bitmap Editors
@@ -243,9 +243,7 @@ export LDFLAGS="%{optflags} -lm"
 	--without-webkit\
 	--with-lcms=lcms2\
 %endif
-%if %{without python2}
-	--disable-python \
-%endif
+        %{!?with_python_plugin:--disable-python} \
 	--libexecdir=%{_libexecdir}\
 	--enable-default-binary\
 	--disable-check-update\
@@ -367,7 +365,7 @@ install -m 644 -c macros.gimp \
 %{_libdir}/libgimpui-2.0.so.*
 %{_libdir}/libgimpwidgets-2.0.so.*
 
-%if %{with python2}
+%if %{with python_plugin}
 %files plugins-python -f plugins-python.list
 %{_libdir}/gimp/2.0/environ/pygimp.env
 %{_libdir}/gimp/2.0/interpreters/pygimp.interp