From e2f52bc96bb8d05d4f17f67b408da3a97d816fb3 Mon Sep 17 00:00:00 2001 From: cherry530 Date: Sat, 8 Jan 2022 13:16:14 +0800 Subject: [PATCH] Drop python-nose Signed-off-by: cherry530 --- Drop-python-nose-from-the-dependencies.patch | 36 ++++++++++++++++++++ initial-setup.spec | 11 +++--- 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 Drop-python-nose-from-the-dependencies.patch diff --git a/Drop-python-nose-from-the-dependencies.patch b/Drop-python-nose-from-the-dependencies.patch new file mode 100644 index 0000000..713887c --- /dev/null +++ b/Drop-python-nose-from-the-dependencies.patch @@ -0,0 +1,36 @@ +From 9c8ba1568f48079626d7cce2912420ba30064ef3 Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Fri, 12 Feb 2021 10:14:50 +0100 +Subject: [PATCH] Drop python-nose from the dependencies (#1916799) + +The initial setup doesn't use it. + +Resolves: rhbz#1916799 +--- + initial-setup.spec | 1 - + setup.py | 1 - + 2 files changed, 2 deletions(-) +diff --git a/initial-setup.spec b/initial-setup.spec +index 37bd5bf..2d75b6c 100644 +--- a/initial-setup.spec ++++ b/initial-setup.spec +@@ -20,7 +20,6 @@ Group: System Environment/Base + BuildRequires: gettext + BuildRequires: python3-devel + BuildRequires: python3-setuptools +-BuildRequires: python3-nose + BuildRequires: systemd-units + BuildRequires: gtk3-devel + BuildRequires: glade-devel +diff --git a/setup.py b/setup.py +index 73cc025..9ab4ff9 100644 +--- a/setup.py ++++ b/setup.py +@@ -57,7 +57,6 @@ setup( + "": ["*.glade"] + }, + data_files = data_files, +- setup_requires= ['nose>=1.0'], + test_suite = "initial_setup", + long_description=read('README.rst'), + classifiers=[ diff --git a/initial-setup.spec b/initial-setup.spec index f7364b0..e03073f 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,15 +1,16 @@ Name: initial-setup Version: 0.3.62 -Release: 6 +Release: 7 Summary: Initialize system configuration for a newly installed computer License: GPLv2+ URL: https://github.com/rhinstaller/initial-setup Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.62.1-1.tar.gz +Patch0001: Drop-python-nose-from-the-dependencies.patch Patch9001: initial-setup-add-support-openeuler.patch %define debug_package %{nil} -BuildRequires: gettext python3-devel python3-setuptools python3-nose systemd-units +BuildRequires: gettext python3-devel python3-setuptools systemd-units BuildRequires: gtk3-devel glade-devel anaconda >= 29.13 intltool Requires: python3 anaconda-tui >= 29.13 systemd >= 235 python3-libreport util-linux Requires: gtk3 anaconda-gui >= 29.13 firstboot(windowmanager) xorg-x11-xinit @@ -33,9 +34,6 @@ rm -rf *.egg-info %build %make_build -%check -make test - %install %make_install @@ -75,6 +73,9 @@ fi %{_unitdir}/{initial-setup,initial-setup-reconfiguration}.service %changelog +* Sat Jan 08 2022 xu_ping - 0.36.62-7 +- Drop python-nose + * Thu Aug 20 2020 lingsheng - 0.36.62-6 - Change require to python3-libreport -- Gitee