Resolves: #2068037 Sync to fedora branch

This commit is contained in:
Jan Horak 2022-03-30 11:54:11 +02:00
parent eeb921243a
commit 384c1163bb

View File

@ -28,107 +28,23 @@ data:
default:
rpms:
- inkscape
filter:
rpms:
- atkmm-devel
- cairomm-devel
- gc-devel
- glibmm24-devel
- gsl-devel
- gtkmm24-devel
- gtkspell3-devel
- gvfs-devel
- libatomic_ops-devel
- libatomic_ops-static
- librevenge-devel
- libsigc++20-devel
- libwpd-devel
- libwpg-devel
- openblas-devel
- openblas-static
- openjpeg2-devel
- openjpeg2-devel-docs
- pangomm-devel
- poppler-cpp-devel
- poppler-data-devel
- poppler-devel
- poppler-glib-devel
- poppler-qt5-devel
- potrace-devel
buildopts:
rpms:
# We set _with_bootstrap for python2-pip, to avoid dependency on python2-wheel
# We set _without_rpmwheels to disable a requirements on
# python2-setuptools-wheel, python2-pip-wheel in the
# python2 package - avoiding a circular dependency.
#
# We disable all tests by default
#
# We set _tmpfilesdir and _userunitdir to override the standard
# /usr-prefixed values and fix the build of gvfs
macros: |
%_with_bootstrap 1
%_without_tests 1
%_tmpfilesdir /app/lib/tmpfiles.d
%_userunitdir /app/lib/systemd/user
components:
rpms:
atkmm:
# After glibmm24
double-conversion:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30
cairomm:
# After libsigc++20
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 20
Cython:
# after python2-setuptools
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30
ref: f35
gc:
# after libatomic_ops
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 20
glibmm24:
# After libsigc++20
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 20
gsl:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
gtkspell3:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
gvfs:
# The build pulls in a a lot of packages, but these are dependencies
# of the daemon, which we don't need in the Flatpak, so we can let them
# come from the base package set
rationale: gvfs-client is a runtime dependency of inkscape
ref: rhel-9.0.0
buildorder: 10
inkscape:
rationale: Application package
ref: rhel-9.0.0
buildorder: 100
libatomic_ops:
rationale: Dependency of gc
ref: rhel-9.0.0
buildorder: 10
librevenge:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
libsigc++20:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
libwpd:
rationale: Runtime dependency
ref: rhel-9.0.0
@ -137,59 +53,22 @@ data:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
openblas:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
numpy:
# after python-setuptools, python2-nose, Cython, openblas
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 50
openjpeg2:
rationale: poppler dependency
ref: rhel-9.0.0
buildorder: 10
pangomm:
# after cairomm, glibmm24
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30
poppler:
# after openjpeg2, poppler-data
rationale: inkscape dependency
ref: rhel-9.0.0
buildorder: 20
poppler-data:
rationale: poppler dependency
ref: rhel-9.0.0
buildorder: 10
potrace:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 10
python-coverage:
# after python2-setuptools
rationale: python-nose build dependency
python-appdirs:
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30
python-lxml:
# after python2-setuptools, Cython
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 40
python-markupsafe:
# after python-setuptools
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30
python-nose:
# after python-coverage
rationale: Dependency required by numpy
ref: rhel-9.0.0
buildorder: 40
python-scour:
# after python2-setuptools
rationale: Runtime dependency
ref: rhel-9.0.0
buildorder: 30