diff --git a/Drop-python-nose-from-the-dependencies.patch b/Drop-python-nose-from-the-dependencies.patch new file mode 100644 index 0000000000000000000000000000000000000000..713887cb3ccecd0c423581d4d96d5ec663a164bb --- /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 f7364b0e2a52a6927564dcb25299b21c23d94025..f12a577667e1137ffb8e5c09b1741ddbbb4180a8 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,15 +1,17 @@ Name: initial-setup -Version: 0.3.62 -Release: 6 +Version: 0.3.83 +Release: 1 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 +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 + %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 @@ -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. %prep -%autosetup -n initial-setup-r0.3.62-1 -p1 +%autosetup -n initial-setup-r0.3.83-1 -p1 rm -rf *.egg-info %build @@ -58,6 +60,7 @@ if [ $1 -gt 1 ] ; then fi fi + %post %systemd_post %{name}.service @@ -73,8 +76,18 @@ fi %{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled} %{_libexecdir}/%{name}/{initial-setup-graphical,initial-setup-text} %{_unitdir}/{initial-setup,initial-setup-reconfiguration}.service +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/conf.d +%config %{_sysconfdir}/%{name}/conf.d/* + %changelog +* Tues Feb 22 2022 yangping - 0.3.83-1 +- Upgrade to 0.3.83 + +* 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 diff --git a/r0.3.62.1-1.tar.gz b/r0.3.62.1-1.tar.gz deleted file mode 100644 index 811ffeba94b833261a3ccd64fa012653d6d193c4..0000000000000000000000000000000000000000 Binary files a/r0.3.62.1-1.tar.gz and /dev/null differ diff --git a/r0.3.83-1.tar.gz b/r0.3.83-1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bff12a2c4aac9b926208fe0f4cde44470a5e8099 Binary files /dev/null and b/r0.3.83-1.tar.gz differ