diff --git a/Drop-python-nose-from-the-dependencies.patch b/Drop-python-nose-from-the-dependencies.patch deleted file mode 100644 index 713887cb3ccecd0c423581d4d96d5ec663a164bb..0000000000000000000000000000000000000000 --- a/Drop-python-nose-from-the-dependencies.patch +++ /dev/null @@ -1,36 +0,0 @@ -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-0.3.95.tar.gz b/initial-setup-0.3.95.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ea55edb44484a8aec449b1a62da5558b4cfa7277 Binary files /dev/null and b/initial-setup-0.3.95.tar.gz differ diff --git a/initial-setup-add-support-openeuler.patch b/initial-setup-add-support-openeuler.patch deleted file mode 100644 index fd085eb308d8d0544d70da1549cf52b762dd8c36..0000000000000000000000000000000000000000 --- a/initial-setup-add-support-openeuler.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp a/initial_setup/product.py b/initial_setup/product.py ---- a/initial_setup/product.py 2018-07-27 20:51:58.000000000 +0800 -+++ b/initial_setup/product.py 2019-08-12 22:19:17.280000000 +0800 -@@ -7,7 +7,7 @@ import os - import glob - - RELEASE_STRING_FILE = "/etc/os-release" --LICENSE_FILE_GLOB = "/usr/share/redhat-release*/EULA*" -+LICENSE_FILE_GLOB = "/usr/share/openeuler-release*/EULA*" - - log = logging.getLogger("initial-setup") diff --git a/initial-setup.spec b/initial-setup.spec index fd34283766c58c315c7927f6d52f93499e782abb..f03f244dd81a8da108cd9a7eb621a26c3cd6f512 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,87 +1,107 @@ -Name: initial-setup -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.83-1.tar.gz -Patch0001: Drop-python-nose-from-the-dependencies.patch -Patch9001: initial-setup-add-support-openeuler.patch +Name: initial-setup +Version: 0.3.95 +Release: 1 +Summary: Initialize system configuration for a newly installed computer +License: GPLv2+ +URL: https://github.com/rhinstaller/initial-setup +Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} - -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 -Requires: xorg-x11-server-Xorg -Requires(post): systemd -Requires(preun): systemd +%define anacondaver 37.8-1 + +License: GPLv2+ +BuildRequires: gettext +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: systemd-units +BuildRequires: gtk3-devel +BuildRequires: glade-devel +BuildRequires: intltool +BuildRequires: make + +Requires: %{__python3} +Requires: anaconda-tui >= %{anacondaver} +Requires: python3-simpleline >= 1.4 +Requires: systemd >= 235 +Requires(post): systemd +Requires(preun): systemd Requires(postun): systemd -Conflicts: firstboot < 19.2 - -Provides: %{name}-gui = %{version}-%{release} -Obsoletes: %{name}-gui < %{version}-%{release} +Requires: util-linux +Conflicts: firstboot < 19.2 %description -The initial-setup application run during the first start of a newly installed computer and -makes it possible to configure the computer according to the needs of the user. +The initial-setup utility runs after installation. It guides the user through +a series of steps that allows for easier configuration of the machine. + +%package gui +Summary: Graphical user interface for the initial-setup utility +Requires: gtk3 +Requires: anaconda-gui >= %{anacondaver} +Requires: firstboot(windowmanager) +Requires: xorg-x11-xinit +Requires: xorg-x11-server-Xorg +Requires: %{name} = %{version}-%{release} + +%description gui +The initial-setup-gui package contains a graphical user interface for the +initial-setup utility. %prep -%autosetup -n initial-setup-r0.3.83-1 -p1 +%autosetup -p 1 + +# remove upstream egg-info rm -rf *.egg-info %build -%make_build - -%check -make test +make %install -%make_install - -%clean rm -rf %{buildroot} +make DESTDIR=%{buildroot} install -%pre -if [ $1 -gt 1 ] ; then - IS_GRAPHICAL_AVAILABLE=0 - IS_TEXT_AVAILABLE=0 - systemctl is-enabled initial-setup-graphical.service && IS_GRAPHICAL_AVAILABLE=1 - systemctl is-enabled initial-setup-text.service && IS_TEXT_AVAILABLE=1 - if [ $IS_GRAPHICAL_AVAILABLE -eq 1 ]; then - systemctl stop initial-setup-graphical.service - systemctl disable initial-setup-graphical.service - fi - if [ $IS_TEXT_AVAILABLE -eq 1 ]; then - systemctl stop initial-setup-text.service - systemctl disable initial-setup-text.service - fi -fi +%find_lang %{name} +%clean +rm -rf %{buildroot} %post -%systemd_post %{name}.service +%systemd_post initial-setup.service %preun -%systemd_preun %{name}.service +%systemd_preun initial-setup.service %postun -%systemd_postun %{name}.service - -%files -%doc README.rst COPYING -%{python3_sitelib}/{initial_setup*,initial_setup/gui/*} -%{_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 +%systemd_postun initial-setup.service + +%files -f %{name}.lang +%doc README.rst ChangeLog +%license COPYING +%{python3_sitelib}/initial_setup* +%exclude %{python3_sitelib}/initial_setup/gui +%{_libexecdir}/%{name}/run-initial-setup +%{_libexecdir}/%{name}/firstboot-windowmanager +%{_libexecdir}/%{name}/initial-setup-text +%{_libexecdir}/%{name}/reconfiguration-mode-enabled +%{_unitdir}/initial-setup.service +%{_unitdir}/initial-setup-reconfiguration.service %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/conf.d %config %{_sysconfdir}/%{name}/conf.d/* +%ifarch s390 s390x +%{_sysconfdir}/profile.d/initial-setup.sh +%{_sysconfdir}/profile.d/initial-setup.csh +%endif + +%files gui +%{_libexecdir}/%{name}/initial-setup-graphical +%{python3_sitelib}/initial_setup/gui/ %changelog +* Tue Nov 8 2022 hkgy - 0.3.95-1 +- Upgrade to v0.3.95 + * Fri Apr 29 2022 yangping - 0.3.83-1 - Upgrade to 0.3.83 diff --git a/r0.3.83-1.tar.gz b/r0.3.83-1.tar.gz deleted file mode 100644 index bff12a2c4aac9b926208fe0f4cde44470a5e8099..0000000000000000000000000000000000000000 Binary files a/r0.3.83-1.tar.gz and /dev/null differ