rpm/inkscape
SHA256
1
0
Fork 0
forked from pool/inkscape
Code Pull Requests Activity

Accepting request 794650 from home:dimstar:Factory

Browse Source 
Fix previous python2-removal commit

OBS-URL: https://build.opensuse.org/request/show/794650
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2020-04-16 19:06:51 +00:00 committed by Git OBS Bridge
parent 7075dd4316
commit 23d89d24e3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inkscape.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 16 18:40:23 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fixup files sections for sk1 exclusion.
-------------------------------------------------------------------
Wed Apr 8 12:44:46 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

14
inkscape.spec
View File

@ -219,6 +219,11 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/inkscape/palettes
%find_lang %{name} %{?no_lang_C}
%if !%{with python2}
# remove skencil extension as we need sk1 that is py2 only
rm -rf %{buildroot}%{_datadir}/inkscape/extensions/sk*
%endif
# split extensions
bash %{SOURCE2} %{buildroot}%{_datadir}/inkscape/extensions "%%{_datadir}/inkscape/extensions/"
@ -239,11 +244,6 @@ 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
@ -288,7 +288,9 @@ rm -rf %{buildroot}%{_datadir}/inkscape/extensions/sk*
%exclude %{_datadir}/inkscape/extensions/dia*
%exclude %{_datadir}/inkscape/extensions/fig*
%exclude %{_datadir}/inkscape/extensions/*gimp*
%if %{with python2}
%exclude %{_datadir}/inkscape/extensions/sk*
%endif
%exclude %{_datadir}/inkscape/extensions/*dxf*
# this one is in extras, manually added there due to large dependencies on ghostscript
%exclude %{_datadir}/inkscape/extensions/ps2pdf-ext.py
@ -304,7 +306,9 @@ rm -rf %{buildroot}%{_datadir}/inkscape/extensions/sk*
%{_datadir}/inkscape/extensions/ps2dxf.sh
# This extensions seems erronous being copied in here too.
%exclude %{_datadir}/inkscape/extensions/*gimp*
%if %{with python2}
%exclude %{_datadir}/inkscape/extensions/sk*
%endif
%files extensions-dia
%{_datadir}/inkscape/extensions/dia*