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

Fix the pyxattr dependency to allow kiwi to function

package/python-kiwi-spec-template

@@ -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}"

setup.py

@@ -186,7 +186,7 @@ def run(self):
     'install_requires': [
         'docopt>=0.6.2',
         'lxml',
-        'xattr',
+        'pyxattr',
         'requests',
         'PyYAML'
     ],