Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/inkscape.git#845547875ced1d59fefb163303c80ee1212d2b29
This commit is contained in:
DistroBaker 2021-02-03 21:11:17 +00:00
parent 2f5a3bc7ba
commit d3d4b74355
4 changed files with 12 additions and 32 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ inkscape.tar.bz2
/inkscape-1.0rc1_2020-04-09_09960d6f05.tar.xz
/inkscape-1.0_2020-05-01_4035a4fb49.tar.xz
/inkscape-1.0.1.tar.xz
/inkscape-1.0.2.tar.xz

View File

@ -1,25 +0,0 @@
From 16f50bf4c4df921b9e816e09971c4f9aa9bb8ade Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 8 Sep 2020 00:59:36 +0200
Subject: [PATCH] Fix appdata
---
org.inkscape.Inkscape.appdata.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.inkscape.Inkscape.appdata.xml.in b/org.inkscape.Inkscape.appdata.xml.in
index a99ecddb20..e1febd5034 100644
--- a/org.inkscape.Inkscape.appdata.xml.in
+++ b/org.inkscape.Inkscape.appdata.xml.in
@@ -39,7 +39,7 @@
</screenshot>
</screenshots>
<releases>
- <release version="1.0" date="2020-09-07">
+ <release version="1.0.1" date="2020-09-07">
<description>
<p>Inkscape 1.0.1</p>
<ul>
--
2.26.2

View File

@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: inkscape
Version: 1.0.1
Release: 4.1%{?dist}
Version: 1.0.2
Release: 1%{?dist}
Summary: Vector-based drawing program using SVG
# Inkscape tags their releases with underscores and in ALLCAPS
@ -10,14 +10,12 @@ Summary: Vector-based drawing program using SVG
License: GPLv2+ and CC-BY
URL: https://inkscape.org/
Source0: https://inkscape.org/gallery/item/21571/inkscape-1.0.1.tar.xz
Source0: https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz
# Fedora Color Palette, GIMP format, CC-BY 3.0
Source2: Fedora-Color-Palette.gpl
Patch1: inkscape-gcc11.patch
# Backported from upstream
Patch2: inkscape-appdata.patch
Provides: bundled(libcroco)
Provides: bundled(libgdl)
@ -112,7 +110,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
%autosetup -n inkscape-1.0.1_2020-09-07_3bc2e813f5 -p1
%autosetup -n inkscape-1.0.2_2021-01-15_e86c870879 -p1
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g'
@ -226,6 +224,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
* Mon Feb 01 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.2-1
- 1.0.2
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 12 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.0.1-4
- Poppler rebuild.

View File

@ -1 +1 @@
SHA512 (inkscape-1.0.1.tar.xz) = 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
SHA512 (inkscape-1.0.2.tar.xz) = f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d