From 344289f79636296a01abced99a7bf2e0f16eaac3 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Tue, 10 Nov 2020 15:48:11 +0800
Subject: [PATCH 6/9] fix: Disable grub-related functions
Grub-related functions may not work well on Fedora
Log: Disable grub-related functions
Signed-off-by: Robin Lee <cheeselee@fedoraproject.org>
---
rpm/dde-daemon.spec | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/rpm/dde-daemon.spec b/rpm/dde-daemon.spec
index 6091f00f..86287bc8 100644
--- a/rpm/dde-daemon.spec
+++ b/rpm/dde-daemon.spec
@@ -217,8 +217,6 @@ fi
%files -f %{repo}.lang
%doc README.md
%license LICENSE
-%{_sysconfdir}/default/grub.d/10_deepin.cfg
-%{_sysconfdir}/grub.d/35_deepin_gfxmode
%{_sysconfdir}/pam.d/deepin-auth-keyboard
%{_sysconfdir}/NetworkManager/conf.d/deepin.dde.daemon.conf
%{_sysconfdir}/modules-load.d/i2c_dev.conf
@@ -233,7 +231,6 @@ fi
%{_datadir}/polkit-1/actions/*.policy
%{_var}/cache/appearance/
%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
-%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
%{_sysconfdir}/acpi/actions/deepin_lid.sh
%{_sysconfdir}/acpi/events/deepin_lid
# This directory is not provided by any other package.
@@ -247,6 +244,17 @@ fi
%if 0%{?fedora}
%{_sysusersdir}/%{name}.conf
%{_datadir}/deepin-default-settings/
+%exclude %{_sysconfdir}/default/grub.d/10_deepin.cfg
+%exclude %{_sysconfdir}/grub.d/35_deepin_gfxmode
+%exclude %{_libexecdir}/%{name}/grub2
+%exclude %{_datadir}/dbus-1/system-services/com.deepin.daemon.Grub2.service
+%exclude %{_datadir}/dbus-1/system.d/com.deepin.daemon.Grub2.conf
+%exclude %{_datadir}/polkit-1/actions/com.deepin.daemon.Grub2.policy
+%exclude %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
+%else
+%{_sysconfdir}/default/grub.d/10_deepin.cfg
+%{_sysconfdir}/grub.d/35_deepin_gfxmode
+%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla
%endif
%changelog
--
2.26.2