remove requires python3-networkx

This commit is contained in:
liquor 2020-08-06 15:44:52 +08:00
parent 47260e32a1
commit 504dadfad2
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From a2faa263c9dd8bcf51465861046e0406a84975c0 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
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

View File

@ -1,7 +1,7 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: setools Name: setools
Version: 4.3.0 Version: 4.3.0
Release: 1 Release: 2
Summary: Policy Analysis Tools for SELinux Summary: Policy Analysis Tools for SELinux
License: GPLv2 License: GPLv2
URL: https://github.com/SELinuxProject/setools/wiki URL: https://github.com/SELinuxProject/setools/wiki
@ -11,6 +11,7 @@ Source2: apol.desktop
Patch0: 0001-Do-not-use-Werror-during-build.patch Patch0: 0001-Do-not-use-Werror-during-build.patch
Patch1: 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.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: flex bison glibc-devel gcc swig git python3-setuptools
BuildRequires: qt5-qtbase-devel python3-devel BuildRequires: qt5-qtbase-devel python3-devel
@ -111,6 +112,9 @@ rm -rf %{buildroot}%{_bindir}
%{_mandir}/ru/man1/* %{_mandir}/ru/man1/*
%changelog %changelog
* Thu Aug 6 2020 Liquor <lirui130@huawei.com> - 4.3.0-2
- remove requires python3-networkx
* Thu Jul 30 2020 linwei <linwei54@huawei.com> - 4.3.0-1 * Thu Jul 30 2020 linwei <linwei54@huawei.com> - 4.3.0-1
- update setools to 4.3.0 - update setools to 4.3.0