From b399dc63aba5b6f4395ccf19e701cbadfe6688ff Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 9 Oct 2024 21:33:44 +0300 Subject: [PATCH] Place eula files only in live package to avoid license dupes in initial-setup --- SPECS/anaconda.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 2f8aeb8..8e86217 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.25.4.9 -Release: 1%{?dist}.inferit.102.certified +Release: 1%{?dist}.inferit.103.certified License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -183,6 +183,8 @@ BuildRequires: desktop-file-utils Requires: anaconda-gui = %{version}-%{release} Requires: usermode Requires: zenity +# Avoid double licensing +Conflicts: initial-setup-gui %description live The anaconda-live package contains scripts, data and dependencies required @@ -406,6 +408,12 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_datadir}/applications/*.desktop %{_datadir}/anaconda/gnome %{_sysconfdir}/xdg/autostart/*.desktop +%{_datadir}/anaconda/ui/spokes/eula.* +%{_datadir}/anaconda/ui/spokes/eula.* +%{python3_sitearch}/pyanaconda/ui/gui/spokes/eula.* +%{python3_sitearch}/pyanaconda/ui/gui/spokes/__pycache__/eula.* +%{python3_sitearch}/pyanaconda/ui/tui/eula.* +%{python3_sitearch}/pyanaconda/ui/tui/spokes/__pycache__/eula.* %files gui %{python3_sitearch}/pyanaconda/ui/gui/* @@ -416,6 +424,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %exclude %{_datadir}/anaconda/ui/spokes/blivet_gui.* %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/blivet_gui.* %endif +# Place eula to live only +%exclude %{_datadir}/anaconda/ui/spokes/eula.* +%exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/eula.* +%exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/__pycache__/eula.* %{_datadir}/anaconda/window-manager %{_datadir}/anaconda/anaconda-gtk.css @@ -423,6 +435,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{python3_sitearch}/pyanaconda/rescue.py %{python3_sitearch}/pyanaconda/__pycache__/rescue.* %{python3_sitearch}/pyanaconda/ui/tui/* +%exclude %{python3_sitearch}/pyanaconda/ui/tui/eula.* +%exclude %{python3_sitearch}/pyanaconda/ui/tui/spokes/__pycache__/eula.* %files widgets %{_libdir}/libAnacondaWidgets.so.* @@ -442,6 +456,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Oct 09 2024 Arkady L. Shane - 34.25.4.9-1.inferit.103.certified +- Place eula files only in live package to avoid license dupes in initial-setup + * Thu Sep 26 2024 Dmitry Samoylik - 34.25.4.9-1.inferit.102.certified - Implement show EULA before installation