From b27da7ab42571bf6421e4cc38055821f3a923dd1 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 9 Jun 2024 12:54:34 +0200
Subject: [PATCH] replace group name wheel with sysadmin in polkit rule file
 [release 1.9.20-2mamba;Sat Jun 08 2024]

---
 fwupd-1.7.7-tpm2-tss-3.2.0.patch | 11 -----------
 fwupd.spec                       | 19 +++++--------------
 2 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 fwupd-1.7.7-tpm2-tss-3.2.0.patch

diff --git a/fwupd-1.7.7-tpm2-tss-3.2.0.patch b/fwupd-1.7.7-tpm2-tss-3.2.0.patch
deleted file mode 100644
index c0fabc4..0000000
--- a/fwupd-1.7.7-tpm2-tss-3.2.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fwupd-1.7.7/meson.build.orig	2022-04-18 15:01:16.000000000 +0200
-+++ fwupd-1.7.7/meson.build	2022-04-18 16:14:36.591188389 +0200
-@@ -415,7 +415,7 @@
- endif
- 
- if build_standalone and get_option('plugin_tpm')
--  tpm2tss = dependency('tss2-esys', version : '>= 2.0')
-+  tpm2tss = dependency('tss2-esys')
-   conf.set('HAVE_TSS2', '1')
- else
-   tpm2tss = dependency('', required: false)
diff --git a/fwupd.spec b/fwupd.spec
index cedf790..bd51ac5 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -1,6 +1,6 @@
 Name:          fwupd
 Version:       1.9.20
-Release:       1mamba
+Release:       2mamba
 Summary:       A simple daemon to allow session software to update firmware
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -8,7 +8,6 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://fwupd.org/
 Source:        https://github.com/hughsie/fwupd.git/%{version}/fwupd-%{version}.tar.bz2
-Patch0:        fwupd-1.7.7-tpm2-tss-3.2.0.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -62,8 +61,7 @@ This package contains libraries and header files for developing applications tha
 %prep
 %setup -q
 #-D -T
-#sed -i "s|'python3'|'python3.6'|" meson.build
-#%patch0 -p1
+sed -i 's,wheel,sysadmin,' policy/org.freedesktop.fwupd*.rules
 
 %build
 %meson \
@@ -78,9 +76,6 @@ This package contains libraries and header files for developing applications tha
 
 %find_lang %{name} --all-name || touch %{name}.lang
 
-#install -d -m0755 %{buildroot}%{_modulesloaddir}
-#mv %{buildroot}/lib/modules-load.d/* %{buildroot}%{_modulesloaddir}/
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -144,8 +139,6 @@ end
 %{_sysconfdir}/pki/fwupd/*
 %{_sysconfdir}/grub.d/35_fwupd
 %{_bindir}/dbxtool
-#%{_bindir}/fwupdagent
-#%{_bindir}/fwupdate
 %{_bindir}/fwupdtool
 %{_systemd_util_dir}/system-shutdown/fwupd.shutdown
 %{_modulesloaddir}/fwupd-msr.conf
@@ -156,9 +149,7 @@ end
 %{_unitdir}/fwupd-refresh.timer
 %{_unitdir}/system-update.target.wants/fwupd-offline-update.service
 %{_udevrulesdir}/90-fwupd-devices.rules
-#%{_bindir}/dfu-tool
 %{_bindir}/fwupdmgr
-#%{_datadir}/bash-completion/completions/fwupdagent
 %{_datadir}/bash-completion/completions/fwupdmgr
 %{_datadir}/bash-completion/completions/fwupdtool
 %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
@@ -174,10 +165,7 @@ end
 %{_datadir}/vala/vapi/fwupd.deps
 %{_datadir}/vala/vapi/fwupd.vapi
 %{_mandir}/man1/dbxtool.1*
-#%{_mandir}/man1/dfu-tool.1*
 %{_mandir}/man1/fwupdmgr.1*
-#%{_mandir}/man1/fwupdagent.1*
-#%{_mandir}/man1/fwupdate.1*
 %{_mandir}/man1/fwupdtool.1*
 %{_mandir}/man5/fwupd-remotes.d.5*
 %{_mandir}/man5/fwupd.conf.5*
@@ -215,6 +203,9 @@ end
 #%doc README.md
 
 %changelog
+* Sat Jun 08 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.9.20-2mamba
+- replace group name wheel with sysadmin in polkit rule file
+
 * Tue May 21 2024 Automatic Build System <autodist@openmamba.org> 1.9.20-1mamba
 - automatic version update by autodist