!18 Update initial-setup to v0.3.83

From: @penelope_y 
Reviewed-by: @ruebb 
Signed-off-by: @ruebb
This commit is contained in:
openeuler-ci-bot 2022-05-05 11:03:11 +00:00 committed by Gitee
commit 9384ad40d9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 51 additions and 5 deletions

View File

@ -0,0 +1,36 @@
From 9c8ba1568f48079626d7cce2912420ba30064ef3 Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
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=[

View File

@ -1,15 +1,17 @@
Name: initial-setup Name: initial-setup
Version: 0.3.62 Version: 0.3.83
Release: 6 Release: 1
Summary: Initialize system configuration for a newly installed computer Summary: Initialize system configuration for a newly installed computer
License: GPLv2+ License: GPLv2+
URL: https://github.com/rhinstaller/initial-setup URL: https://github.com/rhinstaller/initial-setup
Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.62.1-1.tar.gz Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.83-1.tar.gz
Patch0001: Drop-python-nose-from-the-dependencies.patch
Patch9001: initial-setup-add-support-openeuler.patch Patch9001: initial-setup-add-support-openeuler.patch
%define debug_package %{nil} %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 BuildRequires: gtk3-devel glade-devel anaconda >= 29.13 intltool
Requires: python3 anaconda-tui >= 29.13 systemd >= 235 python3-libreport util-linux Requires: python3 anaconda-tui >= 29.13 systemd >= 235 python3-libreport util-linux
Requires: gtk3 anaconda-gui >= 29.13 firstboot(windowmanager) xorg-x11-xinit Requires: gtk3 anaconda-gui >= 29.13 firstboot(windowmanager) xorg-x11-xinit
@ -27,7 +29,7 @@ The initial-setup application run during the first start of a newly installed co
makes it possible to configure the computer according to the needs of the user. makes it possible to configure the computer according to the needs of the user.
%prep %prep
%autosetup -n initial-setup-r0.3.62-1 -p1 %autosetup -n initial-setup-r0.3.83-1 -p1
rm -rf *.egg-info rm -rf *.egg-info
%build %build
@ -58,6 +60,7 @@ if [ $1 -gt 1 ] ; then
fi fi
fi fi
%post %post
%systemd_post %{name}.service %systemd_post %{name}.service
@ -73,8 +76,15 @@ fi
%{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled} %{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled}
%{_libexecdir}/%{name}/{initial-setup-graphical,initial-setup-text} %{_libexecdir}/%{name}/{initial-setup-graphical,initial-setup-text}
%{_unitdir}/{initial-setup,initial-setup-reconfiguration}.service %{_unitdir}/{initial-setup,initial-setup-reconfiguration}.service
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/conf.d
%config %{_sysconfdir}/%{name}/conf.d/*
%changelog %changelog
* Fri Apr 29 2022 yangping<yangping69@h-partners.com> - 0.3.83-1
- Upgrade to 0.3.83
* Thu Aug 20 2020 lingsheng<lingsheng@huawei.com> - 0.36.62-6 * Thu Aug 20 2020 lingsheng<lingsheng@huawei.com> - 0.36.62-6
- Change require to python3-libreport - Change require to python3-libreport

Binary file not shown.

BIN
r0.3.83-1.tar.gz Normal file

Binary file not shown.