Place eula files only in live package to avoid license dupes in initial-setup

i9-certified
Arkady L. Shane 3 months ago
parent 0de60446fe
commit b399dc63ab
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1,7 +1,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 34.25.4.9 Version: 34.25.4.9
Release: 1%{?dist}.inferit.102.certified Release: 1%{?dist}.inferit.103.certified
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -183,6 +183,8 @@ BuildRequires: desktop-file-utils
Requires: anaconda-gui = %{version}-%{release} Requires: anaconda-gui = %{version}-%{release}
Requires: usermode Requires: usermode
Requires: zenity Requires: zenity
# Avoid double licensing
Conflicts: initial-setup-gui
%description live %description live
The anaconda-live package contains scripts, data and dependencies required 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}/applications/*.desktop
%{_datadir}/anaconda/gnome %{_datadir}/anaconda/gnome
%{_sysconfdir}/xdg/autostart/*.desktop %{_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 %files gui
%{python3_sitearch}/pyanaconda/ui/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 %{_datadir}/anaconda/ui/spokes/blivet_gui.*
%exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/blivet_gui.* %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/blivet_gui.*
%endif %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/window-manager
%{_datadir}/anaconda/anaconda-gtk.css %{_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/rescue.py
%{python3_sitearch}/pyanaconda/__pycache__/rescue.* %{python3_sitearch}/pyanaconda/__pycache__/rescue.*
%{python3_sitearch}/pyanaconda/ui/tui/* %{python3_sitearch}/pyanaconda/ui/tui/*
%exclude %{python3_sitearch}/pyanaconda/ui/tui/eula.*
%exclude %{python3_sitearch}/pyanaconda/ui/tui/spokes/__pycache__/eula.*
%files widgets %files widgets
%{_libdir}/libAnacondaWidgets.so.* %{_libdir}/libAnacondaWidgets.so.*
@ -442,6 +456,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Wed Oct 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 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 <Dmitriy.Samoylik@softline.com> - 34.25.4.9-1.inferit.102.certified * Thu Sep 26 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com> - 34.25.4.9-1.inferit.102.certified
- Implement show EULA before installation - Implement show EULA before installation

Loading…
Cancel
Save