Compare commits
No commits in common. "c585f89ff9c9c4f9c6046e8e9b1ea30d71845194" and "9384ad40d9c6ddd8ed1063e3c6cfd301416ad791" have entirely different histories.
c585f89ff9
...
9384ad40d9
36
Drop-python-nose-from-the-dependencies.patch
Normal file
36
Drop-python-nose-from-the-dependencies.patch
Normal 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=[
|
||||||
@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"_comment_": [
|
|
||||||
"This is a comment",
|
|
||||||
"with multiple lines."
|
|
||||||
],
|
|
||||||
"_default_": {
|
|
||||||
"file": "default-help.xml",
|
|
||||||
"anchor": ""
|
|
||||||
},
|
|
||||||
"installation-summary": {
|
|
||||||
"file": "anaconda-help.xml",
|
|
||||||
"anchor": ""
|
|
||||||
},
|
|
||||||
"user-configuration": {
|
|
||||||
"file": "anaconda-help.xml",
|
|
||||||
"anchor": "creating-a-user-account"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
11
initial-setup-add-support-openeuler.patch
Normal file
11
initial-setup-add-support-openeuler.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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")
|
||||||
@ -1,21 +1,21 @@
|
|||||||
Name: initial-setup
|
Name: initial-setup
|
||||||
Version: 0.3.94
|
Version: 0.3.83
|
||||||
Release: 1
|
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/r%{version}-1.tar.gz
|
Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.83-1.tar.gz
|
||||||
Source1: anaconda-template.json
|
Patch0001: Drop-python-nose-from-the-dependencies.patch
|
||||||
|
Patch9001: initial-setup-add-support-openeuler.patch
|
||||||
|
|
||||||
|
|
||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
BuildRequires: gettext python3-devel python3-setuptools systemd-units
|
BuildRequires: gettext python3-devel python3-setuptools systemd-units
|
||||||
BuildRequires: gtk3-devel glade-devel anaconda >= 36.7 intltool
|
BuildRequires: gtk3-devel glade-devel anaconda >= 29.13 intltool
|
||||||
Requires: python3 anaconda-tui >= 36.7 systemd >= 235 python3-libreport util-linux
|
Requires: python3 anaconda-tui >= 29.13 systemd >= 235 python3-libreport util-linux
|
||||||
Requires: gtk3 anaconda-gui >= 36.7 firstboot(windowmanager) xorg-x11-xinit
|
Requires: gtk3 anaconda-gui >= 29.13 firstboot(windowmanager) xorg-x11-xinit
|
||||||
Requires: xorg-x11-server-Xorg
|
Requires: xorg-x11-server-Xorg
|
||||||
Requires: python3-simpleline >= 1.4
|
|
||||||
Requires: isocut
|
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
@ -29,26 +29,38 @@ 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-r%{version}-1 -p1
|
%autosetup -n initial-setup-r0.3.83-1 -p1
|
||||||
rm -rf *.egg-info
|
rm -rf *.egg-info
|
||||||
#Source0 is not a git project, generate empty changlog
|
|
||||||
touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' > ChangeLog
|
|
||||||
|
|
||||||
sed -i 's/\/root\/anaconda-ks.cfg/\/etc\/isocut\/anaconda-ks.cfg/g' initial_setup/__init__.py
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
|
%check
|
||||||
|
make test
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
install -d -m 0755 %{buildroot}%{_datadir}/anaconda/help
|
|
||||||
cp %{SOURCE1} %{buildroot}%{_datadir}/anaconda/help/anaconda-tui.json
|
|
||||||
cp %{SOURCE1} %{buildroot}%{_datadir}/anaconda/help/anaconda-gui.json
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
%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
|
||||||
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post %{name}.service
|
%systemd_post %{name}.service
|
||||||
|
|
||||||
@ -59,7 +71,6 @@ rm -rf %{buildroot}
|
|||||||
%systemd_postun %{name}.service
|
%systemd_postun %{name}.service
|
||||||
|
|
||||||
%files
|
%files
|
||||||
#-f %{name}.lang
|
|
||||||
%doc README.rst COPYING
|
%doc README.rst COPYING
|
||||||
%{python3_sitelib}/{initial_setup*,initial_setup/gui/*}
|
%{python3_sitelib}/{initial_setup*,initial_setup/gui/*}
|
||||||
%{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled}
|
%{_libexecdir}/%{name}/{run-initial-setup,firstboot-windowmanager,reconfiguration-mode-enabled}
|
||||||
@ -68,27 +79,9 @@ rm -rf %{buildroot}
|
|||||||
%dir %{_sysconfdir}/%{name}
|
%dir %{_sysconfdir}/%{name}
|
||||||
%dir %{_sysconfdir}/%{name}/conf.d
|
%dir %{_sysconfdir}/%{name}/conf.d
|
||||||
%config %{_sysconfdir}/%{name}/conf.d/*
|
%config %{_sysconfdir}/%{name}/conf.d/*
|
||||||
%{_datadir}/anaconda/help/*
|
|
||||||
%exclude %{_defaultdocdir}/%{name}/ChangeLog
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Oct 07 2023 Ge Wang <wang__ge@126.com> - 0.3.94-1
|
|
||||||
- Update to version 0.3.94
|
|
||||||
|
|
||||||
* Mon Aug 28 2023 wangkai <13474090681@163.com> - 0.3.83-5
|
|
||||||
- Remove deprecated support for add-ons
|
|
||||||
- Remove old failing pre scriptlet
|
|
||||||
- Fix rpm version
|
|
||||||
|
|
||||||
* Mon Jul 17 2023 shechenglong<shechenglong@xfusion.com> - 0.3.83-4
|
|
||||||
- Make sure the output from custom_getpass() is serialized after stdout
|
|
||||||
|
|
||||||
* Fri Dec 30 2022 xulei<xulei@xfusion.com> - 0.3.83-3
|
|
||||||
- Add Packit support for initial-setup
|
|
||||||
|
|
||||||
* Fri Dec 30 2022 xulei<xulei@xfusion.com> - 0.3.83-2
|
|
||||||
- Adapt to category title translation fix in Anaconda
|
|
||||||
|
|
||||||
* Fri Apr 29 2022 yangping<yangping69@h-partners.com> - 0.3.83-1
|
* Fri Apr 29 2022 yangping<yangping69@h-partners.com> - 0.3.83-1
|
||||||
- Upgrade to 0.3.83
|
- Upgrade to 0.3.83
|
||||||
|
|
||||||
|
|||||||
BIN
r0.3.83-1.tar.gz
Normal file
BIN
r0.3.83-1.tar.gz
Normal file
Binary file not shown.
BIN
r0.3.94-1.tar.gz
BIN
r0.3.94-1.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user