Compare commits

...

3 Commits
rawhide ... f26

Author SHA1 Message Date
Petr Lautrbach 03687f1d4b setools-python requires python-enum34
Fixes:
>>> import setools
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/lib64/python2.7/site-packages/setools/__init__.py", line 31, in <module>
    from . import policyrep
  File "/usr/lib64/python2.7/site-packages/setools/policyrep/__init__.py", line 26, in <module>
    from .bounds import BoundsRuletype
  File "/usr/lib64/python2.7/site-packages/setools/policyrep/bounds.py", line 24, in <module>
    from .util import PolicyEnum
  File "/usr/lib64/python2.7/site-packages/setools/policyrep/util.py", line 21, in <module>
    from enum import Enum
ImportError: No module named enum
2017-09-04 18:23:06 +02:00
Petr Lautrbach 31fd610d91 setools-4.1.0-4
- bswap_* macros are defined in byteswap.h

Fixes ImportError on s390x:
/usr/lib64/python3.6/site-packages/setools/policyrep/_qpol.cpython-36m-s390x-linux-gnu.so: undefined symbol: bswap_32
2017-09-04 10:29:07 +02:00
Tomas Tomecek c9f64b8b41 add explicit BR on py{2,3} setuptools
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2017-05-30 11:58:24 +02:00
2 changed files with 40 additions and 5 deletions

View File

@ -0,0 +1,26 @@
From 2ac588919dd96d3d624e6ec20c67d1d91386e879 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Thu, 10 Aug 2017 08:23:47 +0200
Subject: [PATCH] bswap_* macros are defined in byteswap.h
Fixes ImportError on s390x:
/usr/lib64/python3.6/site-packages/setools/policyrep/_qpol.cpython-36m-s390x-linux-gnu.so: undefined symbol: bswap_32
---
libqpol/policy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libqpol/policy.c b/libqpol/policy.c
index ae3acb5..e412be0 100644
--- a/libqpol/policy.c
+++ b/libqpol/policy.c
@@ -28,6 +28,7 @@
#include "qpol_internal.h"
#include <assert.h>
+#include <byteswap.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
--
2.13.3

View File

@ -11,7 +11,7 @@
Name: setools
Version: 4.1.0
Release: 3%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
Release: 5%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
Summary: Policy analysis tools for SELinux
License: GPLv2
@ -21,6 +21,7 @@ Source1: setools.pam
Source2: apol.desktop
Patch1: 0001-Do-not-use-Werror-during-build.patch
Patch2: 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
Patch3: 0003-bswap_-macros-are-defined-in-byteswap.h.patch
Obsoletes: setools < 4.0.0, setools-devel < 4.0.0
BuildRequires: flex, bison
@ -28,12 +29,13 @@ BuildRequires: glibc-devel, gcc, git
BuildRequires: libsepol-devel >= %{sepol_ver}, libsepol-static >= %{sepol_ver}
BuildRequires: qt5-qtbase-devel
BuildRequires: swig
BuildRequires: python-devel
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python3-devel
BuildRequires: python3-setuptools
# BuildArch:
BuildRequires: python-devel
Requires: %{name}-python3 = %{version}-%{release}
BuildRequires: python3-devel
%description
SETools is a collection of graphical tools, command-line tools, and
@ -78,6 +80,7 @@ This package includes the following console tools:
%package python
Summary: Policy analysis tools for SELinux
Recommends: libselinux-python
Requires: python-enum34
%description python
SETools is a collection of graphical tools, command-line tools, and
@ -176,7 +179,13 @@ popd
%{_mandir}/man1/apol*
%changelog
* Mon May 22 2017 Petr Lautrbach <plautrba@redhat.com> - 4.1.0-3}
* Mon Sep 04 2017 Petr Lautrbach <plautrba@redhat.com> - 4.1.0-5}
- setools-python requires python-enum34
* Mon Sep 04 2017 Petr Lautrbach <plautrba@redhat.com> - 4.1.0-4
- bswap_* macros are defined in byteswap.h
* Mon May 22 2017 Petr Lautrbach <plautrba@redhat.com> - 4.1.0-3
- setools-python{,3} packages should have a weak dependency on libselinux-python{,3}
(#1447747)