Accepting request 842491 from graphics
OBS-URL: https://build.opensuse.org/request/show/842491 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=121
This commit is contained in:
commit
6698cf5163
10
gimp.changes
10
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>
|
Tue Oct 6 02:29:41 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
16
gimp.spec
16
gimp.spec
@ -19,9 +19,9 @@
|
|||||||
%global abiver 4
|
%global abiver 4
|
||||||
%global apiver 2.0
|
%global apiver 2.0
|
||||||
%if 0%{?sle_version}
|
%if 0%{?sle_version}
|
||||||
%bcond_with python2
|
%bcond_with python_plugin
|
||||||
%else
|
%else
|
||||||
%bcond_without python2
|
%bcond_without python_plugin
|
||||||
%endif
|
%endif
|
||||||
Name: gimp
|
Name: gimp
|
||||||
Version: 2.10.22
|
Version: 2.10.22
|
||||||
@ -64,7 +64,7 @@ BuildRequires: libtiff-devel
|
|||||||
BuildRequires: libwmf-devel >= 0.2.8
|
BuildRequires: libwmf-devel >= 0.2.8
|
||||||
BuildRequires: libxslt-tools
|
BuildRequires: libxslt-tools
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
%if %{with python2}
|
%if %{with python_plugin}
|
||||||
BuildRequires: python-gtk-devel >= 2.10.4
|
BuildRequires: python-gtk-devel >= 2.10.4
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: translation-update-upstream
|
BuildRequires: translation-update-upstream
|
||||||
@ -107,7 +107,7 @@ Requires: libgimp-2_0-0 = %{version}
|
|||||||
Requires: libgimpui-2_0-0 = %{version}
|
Requires: libgimpui-2_0-0 = %{version}
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
%if %{with python2}
|
%if %{with python_plugin}
|
||||||
Recommends: %{name}-plugins-python = %{version}
|
Recommends: %{name}-plugins-python = %{version}
|
||||||
%endif
|
%endif
|
||||||
Recommends: iso-codes
|
Recommends: iso-codes
|
||||||
@ -151,7 +151,7 @@ toolbox and scripting.
|
|||||||
|
|
||||||
This package provides GIMP UI libraries.
|
This package provides GIMP UI libraries.
|
||||||
|
|
||||||
%if %{with python2}
|
%if %{with python_plugin}
|
||||||
%package plugins-python
|
%package plugins-python
|
||||||
Summary: The GNU Image Manipulation Program - python-gtk based plugins
|
Summary: The GNU Image Manipulation Program - python-gtk based plugins
|
||||||
Group: Productivity/Graphics/Bitmap Editors
|
Group: Productivity/Graphics/Bitmap Editors
|
||||||
@ -243,9 +243,7 @@ export LDFLAGS="%{optflags} -lm"
|
|||||||
--without-webkit\
|
--without-webkit\
|
||||||
--with-lcms=lcms2\
|
--with-lcms=lcms2\
|
||||||
%endif
|
%endif
|
||||||
%if %{without python2}
|
%{!?with_python_plugin:--disable-python} \
|
||||||
--disable-python \
|
|
||||||
%endif
|
|
||||||
--libexecdir=%{_libexecdir}\
|
--libexecdir=%{_libexecdir}\
|
||||||
--enable-default-binary\
|
--enable-default-binary\
|
||||||
--disable-check-update\
|
--disable-check-update\
|
||||||
@ -367,7 +365,7 @@ install -m 644 -c macros.gimp \
|
|||||||
%{_libdir}/libgimpui-2.0.so.*
|
%{_libdir}/libgimpui-2.0.so.*
|
||||||
%{_libdir}/libgimpwidgets-2.0.so.*
|
%{_libdir}/libgimpwidgets-2.0.so.*
|
||||||
|
|
||||||
%if %{with python2}
|
%if %{with python_plugin}
|
||||||
%files plugins-python -f plugins-python.list
|
%files plugins-python -f plugins-python.list
|
||||||
%{_libdir}/gimp/2.0/environ/pygimp.env
|
%{_libdir}/gimp/2.0/environ/pygimp.env
|
||||||
%{_libdir}/gimp/2.0/interpreters/pygimp.interp
|
%{_libdir}/gimp/2.0/interpreters/pygimp.interp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user