From c1410dad2819789f115cf24c2b51c2672299f766 Mon Sep 17 00:00:00 2001
From: binlingyu <binlingyu@uniontech.com>
Date: Mon, 4 Sep 2023 13:58:27 +0800
Subject: [PATCH] fix file conflict by del /etc/pam.d/sudo and
 /etc/pam.d/sudo-i

---
 utsudo.spec | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/utsudo.spec b/utsudo.spec
index 8f236e0..92dbe30 100644
--- a/utsudo.spec
+++ b/utsudo.spec
@@ -3,7 +3,7 @@ ExcludeArch: i686
 Summary: The tudo respect sudo
 Name: utsudo
 Version: 0.0.1
-Release: 0.02
+Release: 0.03
 License: ISC
 Group: Applications/System
 URL: https://www.sudo.ws/
@@ -16,6 +16,7 @@ Source3: utsudo.conf
 Requires: pam
 Requires: vim-minimal
 Requires(post): coreutils
+Requires: sudo
 
 BuildRequires: sendmail
 BuildRequires: autoconf
@@ -143,23 +144,6 @@ rm utsudo.lang utsudoers.lang
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/usr/share/doc/utsudo
-cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
-#%%PAM-1.0
-auth       include      system-auth
-account    include      system-auth
-password   include      system-auth
-session    include      system-auth
-EOF
-
-cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
-#%%PAM-1.0
-auth       include      sudo
-account    include      sudo
-password   include      sudo
-session    optional     pam_keyinit.so force revoke
-session    include      sudo
-EOF
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,8 +154,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0640,root,root) %config(noreplace) /etc/utsudo.conf
 %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/utsudo-ldap.conf
 %attr(0750,root,root) %dir /etc/utsudoers.d/
-%config(noreplace) /etc/pam.d/sudo
-%config(noreplace) /etc/pam.d/sudo-i
 %attr(0644,root,root) %{_tmpfilesdir}/utsudo.conf
 %attr(0644,root,root) /etc/dnf/protected.d/utsudo.conf
 %dir /var/db/sudo
@@ -196,6 +178,10 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/utsudoers || :
 
 %changelog
+* Mon Sep 04 2023 Lujun <wanglujun@uniontech.com> - 0.0.1-0.03
+- Add Requires: sudo
+- Del /etc/pam.d/sudo and /etc/pam.d/sudo-i fix file conflict.
+
 * Sat Aug 19 2023 senlin <xiasenlin1@huawei.com> - 0.0.1-0.02
 - Replace command file with rpm to avoid the build-system being unable to recognize it
 
-- 
Gitee