import inkscape-1.1.1-6.el9
This commit is contained in:
parent
34118e2265
commit
e32765a019
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/inkscape-1.1.tar.xz
|
||||
SOURCES/inkscape-1.1.1.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
e61dc54dd15c79eeabc9cc04cc8ecaf15ead42b2 SOURCES/inkscape-1.1.tar.xz
|
||||
203960527f27e9fedf3e662847f759a6b4781178 SOURCES/inkscape-1.1.1.tar.xz
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: inkscape
|
||||
Version: 1.1
|
||||
Release: 3%{?dist}
|
||||
Version: 1.1.1
|
||||
Release: 6%{?dist}
|
||||
Summary: Vector-based drawing program using SVG
|
||||
|
||||
# Inkscape tags their releases with underscores and in ALLCAPS
|
||||
@ -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
|
||||
@ -35,7 +35,6 @@ BuildRequires: gc-devel >= 6.4
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gsl-devel
|
||||
BuildRequires: gtkmm30-devel
|
||||
BuildRequires: gtkspell3-devel
|
||||
%if ! 0%{?flatpak} && ! 0%{?rhel} >= 8
|
||||
BuildRequires: ImageMagick-c++-devel
|
||||
%endif
|
||||
@ -75,6 +74,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 +112,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'
|
||||
|
||||
@ -129,33 +129,15 @@ find . -name '*.h' | xargs chmod -x
|
||||
dos2unix -k -q share/extensions/*.py
|
||||
|
||||
%build
|
||||
#export CFLAGS="${CFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection}"
|
||||
#export CXXFLAGS="${CXXFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection}"
|
||||
#export FFLAGS="${FFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib64/gfortran/modules}"
|
||||
#export FCFLAGS="${FCFLAGS:--O2 -g -pipe -Wall -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib64/gfortran/modules}"
|
||||
#export LDFLAGS="${LDFLAGS:--Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld}"
|
||||
sed -i /FORTIFY_SOURCE/d CMakeLists.txt
|
||||
cmake \
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
|
||||
%cmake3 \
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
|
||||
-DLIB_INSTALL_DIR:PATH=%{_libdir} \
|
||||
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
|
||||
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
|
||||
-DCMAKE_SKIP_RPATH=TRUE \
|
||||
%if "lib64" == "lib64"
|
||||
-DLIB_SUFFIX=64 \
|
||||
%endif
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF .
|
||||
|
||||
%make_build
|
||||
-DBUILD_SHARED_LIBS:BOOL=OFF . \
|
||||
-DCMAKE_SKIP_RPATH=TRUE
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%cmake_install
|
||||
find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f
|
||||
|
||||
# No skencil anymore
|
||||
@ -234,6 +216,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 19 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-6
|
||||
- Stripping extra rpath again
|
||||
|
||||
* Tue Jan 18 2022 Jan Horak <jhorak@redhat.com> - 1.1.1-5
|
||||
- Using system build flags
|
||||
|
||||
* 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user