From 7075dd431693b58838f1829b456ad87c666492b682ffd32e853eb1372669d06d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 16 Apr 2020 13:14:00 +0000 Subject: [PATCH] Accepting request 792462 from home:scarabeus_iv:branches:graphics - Remove sk1 depending extension as sk1 is py2 only * Keep conditioned so it will stay on Leap 15 if backported OBS-URL: https://build.opensuse.org/request/show/792462 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=58 --- inkscape.changes | 6 ++++++ inkscape.spec | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/inkscape.changes b/inkscape.changes index e364304..0905095 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 8 12:44:46 UTC 2020 - Tomáš Chvátal + +- Remove sk1 depending extension as sk1 is py2 only + * Keep conditioned so it will stay on Leap 15 if backported + ------------------------------------------------------------------- Thu Dec 5 18:13:25 UTC 2019 - Bjørn Lie diff --git a/inkscape.spec b/inkscape.spec index 2910631..ab984a4 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,7 +1,7 @@ # # spec file for package inkscape # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # +%bcond_without python2 Name: inkscape Version: 0.92.4 Release: 0 @@ -238,6 +239,11 @@ rm %{name}.man-lang.tmp # Install appdata install -D -m 0644 inkscape.appdata.xml %{buildroot}%{_datadir}/metainfo/inkscape.appdata.xml +%if !%{with python2} +# remove skencil extension as we need sk1 that is py2 only +rm -rf %{buildroot}%{_datadir}/inkscape/extensions/sk* +%endif + %fdupes %{buildroot} # We can't really move the localized manpages to the lang package, since they'd @@ -310,8 +316,10 @@ install -D -m 0644 inkscape.appdata.xml %{buildroot}%{_datadir}/metainfo/inkscap # NOTE: export_gimp_palette* does not depend on gimp, but belongs here logically: %{_datadir}/inkscape/extensions/*gimp* +%if %{with python2} %files extensions-skencil %{_datadir}/inkscape/extensions/sk* +%endif %files lang -f %{name}.lang