Merge pull request #1146 from OSInside/fix-pyxattr-requirement

Fix the pyxattr dependency to allow kiwi to function
This commit is contained in:
Marcus Schäfer 2019-07-22 09:00:25 +02:00 committed by GitHub
commit 554fbb81d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -92,7 +92,7 @@ Requires: python%{python3_pkgversion}-docopt
Requires: python%{python3_pkgversion}-lxml
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools
%if 0%{?suse_version}
%if (0%{?suse_version} && 0%{?suse_version} < 1550)
Requires: python%{python3_pkgversion}-xattr
%else
Requires: python%{python3_pkgversion}-pyxattr
@ -355,6 +355,11 @@ Provides manual pages to describe the kiwi commands
# as an independent script
sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py
%if 0%{?suse_version} && 0%{?suse_version} < 1550
# For older SUSE distributions, use the other xattr Python module
sed -e "s|pyxattr|xattr|" -i setup.py
%endif
%build
# Build Python 3 version
python3 setup.py build --cflags="${RPM_OPT_FLAGS}"

View File

@ -186,7 +186,7 @@ config = {
'install_requires': [
'docopt>=0.6.2',
'lxml',
'xattr',
'pyxattr',
'requests',
'PyYAML'
],