From 36b2f2fb94f0907d8a132ed43e1d61552ef221d6 Mon Sep 17 00:00:00 2001 From: liquor <1692257904@qq.com> Date: Thu, 6 Aug 2020 15:44:52 +0800 Subject: [PATCH] remove requires python3-networkx --- 0003-Require-networkx-on-package-level.patch | 24 ++++++++++++++++++++ setools.spec | 9 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 0003-Require-networkx-on-package-level.patch diff --git a/0003-Require-networkx-on-package-level.patch b/0003-Require-networkx-on-package-level.patch new file mode 100644 index 0000000..46e9a4d --- /dev/null +++ b/0003-Require-networkx-on-package-level.patch @@ -0,0 +1,24 @@ +From a2faa263c9dd8bcf51465861046e0406a84975c0 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Thu, 2 Apr 2020 16:06:14 +0200 +Subject: [PATCH] Require networkx on package level + +It allows us to ship python3-setools without dependency on python3-networkx +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 457c83049ca5..4bfd438002bb 100644 +--- a/setup.py ++++ b/setup.py +@@ -170,5 +170,5 @@ setup(name='setools', + # setup also requires libsepol and libselinux + # C libraries and headers to compile. + setup_requires=['setuptools', 'Cython>=0.27'], +- install_requires=['setuptools', 'networkx>=2.0'] ++ install_requires=['setuptools'] + ) +-- +2.26.0.rc2 + diff --git a/setools.spec b/setools.spec index 8631d85..a9125bb 100644 --- a/setools.spec +++ b/setools.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: setools Version: 4.3.0 -Release: 1 +Release: 2 Summary: Policy Analysis Tools for SELinux License: GPLv2 URL: https://github.com/SELinuxProject/setools/wiki @@ -11,11 +11,13 @@ Source2: apol.desktop Patch0: 0001-Do-not-use-Werror-during-build.patch Patch1: 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +Patch2: 0003-Require-networkx-on-package-level.patch BuildRequires: flex bison glibc-devel gcc swig git python3-setuptools BuildRequires: qt5-qtbase-devel python3-devel BuildRequires: libsepol-devel >= 2.8-1 libsepol-static >= 2.8-1 BuildRequires: python3-Cython +BuildRequires: python3-setuptools Obsoletes: setools < 4.0.0, setools-devel < 4.0.0 %description @@ -26,9 +28,7 @@ and command line. Summary: Console packages for setools License: GPLv2 Requires: python3-setools = %{version}-%{release} libselinux >= 2.8-1 -Requires: python3-network -Requires: python-setuptools %description console Console packages for setools. @@ -111,6 +111,9 @@ rm -rf %{buildroot}%{_bindir} %{_mandir}/ru/man1/* %changelog +* Fri Sep 18 2020 Liquor - 4.3.0-2 +- remove requires python3-networkx + * Sat Aug 29 2020 zoulin - 4.3.0-1 - Update setools to 4.3.0 -- Gitee