From 50813b6106db6b5f5dfd318e9254b417e73a0d82 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 6 Dec 2024 08:57:30 +0100
Subject: [PATCH] fix post and preun script errors due to commented systemd
 macros [release 2.5.0-2mamba;Thu Dec 05 2024]

---
 gnupg2.spec | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/gnupg2.spec b/gnupg2.spec
index 976513f..db9e333 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,6 +1,6 @@
 Name:          gnupg2
 Version:       2.5.0
-Release:       1mamba
+Release:       2mamba
 Summary:       GnuPG is a complete and free replacement for PGP
 Group:         Applications/Security
 Vendor:        openmamba
@@ -53,8 +53,6 @@ GnuPG is a RFC2440 (OpenPGP) compliant application.
 
 %make
 
-#LIBREADLINE="-lreadline -ltermcap"
-
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall pkgdatadir=%{_datadir}/gnupg2
@@ -62,12 +60,7 @@ GnuPG is a RFC2440 (OpenPGP) compliant application.
 ln -s gpg %{buildroot}%{_bindir}/gpg2
 ln -s gpgv %{buildroot}%{_bindir}/gpgv2
 
-# Move the systemd user units to appropriate directory
-#install -d -m755 %{buildroot}%{_userunitdir}
-#mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.socket %{buildroot}%{_userunitdir}
-#mv %{buildroot}%{_docdir}/gnupg/examples/systemd-user/*.service %{buildroot}%{_userunitdir}
-
-
+# Install systemd user sockets to appropriate directory
 units=({dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket)
 socket_target_dir=%{_userunitdir}/sockets.target.wants/
 
@@ -85,31 +78,19 @@ rm -f %{buildroot}%{_infodir}/dir
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %post
-#%systemd_user_post dirmngr.socket
-#%systemd_user_post gpg-agent.socket
-#%systemd_user_post gpg-agent-ssh.socket
-#%systemd_user_post gpg-agent-extra.socket
-#%systemd_user_post gpg-agent-browser.socket
-#%install_info gnupg.info
+%install_info gnupg.info
 :
 
 %preun
-#%systemd_user_preun dirmngr.service
-#%systemd_user_preun gpg-agent.service
-#%systemd_user_preun gpg-agent-ssh.service
-#%systemd_user_preun gpg-agent-extra.service
-#%systemd_user_preun gpg-agent-browser.service
-#%uninstall_info gnupg.info
+%uninstall_info gnupg.info
 :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/dirmngr
 %{_bindir}/dirmngr-client
-#%{_bindir}/g13
 %{_bindir}/gpg*
 %{_bindir}/kbxutil
-#%{_bindir}/symcryptrun
 %{_bindir}/watchgnupg
 %{_sbindir}/addgnupghome
 %{_sbindir}/applygnupgdefaults
@@ -121,8 +102,6 @@ rm -f %{buildroot}%{_infodir}/dir
 %{_libexecdir}/keyboxd
 %{_libexecdir}/scdaemon
 %{_libexecdir}/tpm2daemon
-#%{_userunitdir}/*.service
-#%{_userunitdir}/*.socket
 %{_userunitdir}/sockets.target.wants/*.socket
 %{_infodir}/gnupg.*
 %{_mandir}/man1/*
@@ -133,6 +112,9 @@ rm -f %{buildroot}%{_infodir}/dir
 %doc AUTHORS COPYING
 
 %changelog
+* Thu Dec 05 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.0-2mamba
+- fix post and preun script errors due to commented systemd macros
+
 * Sat Oct 05 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.5.0-1mamba
 - update to 2.5.0