Resolves: #2023184 Sync to fedora branch

This commit is contained in:
Jan Horak 2022-01-13 16:07:18 +01:00
parent e1c49e69a7
commit b738030b05
3 changed files with 10 additions and 4 deletions

1
.gitignore vendored
View File

@ -31,3 +31,4 @@ inkscape.tar.bz2
/inkscape-1.0.1.tar.xz
/inkscape-1.0.2.tar.xz
/inkscape-1.1.tar.xz
/inkscape-1.1.1.tar.xz

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: inkscape
Version: 1.1
Version: 1.1.1
Release: 3%{?dist}
Summary: Vector-based drawing program using SVG
@ -10,7 +10,7 @@ Summary: Vector-based drawing program using SVG
License: GPLv2+ and CC-BY
URL: https://inkscape.org/
Source0: https://inkscape.org/gallery/item/26932/inkscape-1.1.tar.xz
Source0: https://inkscape.org/gallery/item/29255/inkscape-1.1.1.tar.xz
# Fedora Color Palette, GIMP format, CC-BY 3.0
Source2: Fedora-Color-Palette.gpl
@ -32,10 +32,10 @@ BuildRequires: desktop-file-utils
BuildRequires: double-conversion-devel
BuildRequires: freetype-devel
BuildRequires: gc-devel >= 6.4
BuildRequires: libgdl-devel
BuildRequires: gettext
BuildRequires: gsl-devel
BuildRequires: gtkmm30-devel
BuildRequires: gtkspell3-devel
%if ! 0%{?flatpak} && ! 0%{?rhel} >= 8
BuildRequires: ImageMagick-c++-devel
%endif
@ -75,6 +75,7 @@ Requires: python3
Requires: python3-lxml
Requires: python3-numpy
Requires: python3-scour
Requires: python3-appdirs
# Weak dependencies for the LaTeX plugin
Suggests: pstoedit
@ -112,7 +113,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%prep
%autosetup -n inkscape-1.1_2021-05-24_c4e8f9ed74 -p1
%autosetup -n inkscape-1.1.1_2021-09-20_3bf5ae0d25 -p1
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
find . -name CMakeLists.txt | xargs sed -i 's|COMMAND python |COMMAND %{__python3} |g'
@ -234,6 +235,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
%changelog
* Thu Jan 13 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-3
- Sync to Fedora branch
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

View File

@ -1 +1,2 @@
SHA512 (inkscape-1.1.tar.xz) = 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
SHA512 (inkscape-1.1.1.tar.xz) = 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c