From ed08e756cf235638e70c840156b6c0e6f54da097 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sat, 10 Aug 2024 18:50:23 +0800
Subject: [PATCH] cleanup spec

(cherry picked from commit 2579c679ed10d81d92462a2c0425be34e3a44dd5)
---
 Linux-PAM-1.5.3.tar.xz.asc | 16 ----------------
 pam.spec                   | 37 ++++++++++++-------------------------
 2 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 Linux-PAM-1.5.3.tar.xz.asc

diff --git a/Linux-PAM-1.5.3.tar.xz.asc b/Linux-PAM-1.5.3.tar.xz.asc
deleted file mode 100644
index 3b24354..0000000
--- a/Linux-PAM-1.5.3.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJkWBFQAAoJEKgEH6g54W42OoMP/R1O9dvpncrR4DfD3yJViTPw
-To3isPszsdHhw/uZUzCBEUMxhJgUgefzHGAng1EbTyX2eTLk/cnLY8pZLXr3pzC0
-5CfacxAqgjK8B/7CbchsZQCDal84E5jR8qyzVCM3IPxZQfpiR3HJzXVjhg/gnBcY
-L6v7FbLpcdM2keHHT1C/hyQfTnzyIdmwyzRdE1DF3ERbe3/1VlNmANNOacZ1H2T9
-Hs5dVIFiXwOO11Xku42oOo99LCqXyIsRnEogBFCORHNjD7B88lCdJAHssBdvWq5t
-/CJnoGtJrVCXs11JVPSNyW0rm24rZH9YCC6yVRIuMq6jjMBawFUlMAqamLoSA3hK
-4BPuPqQjHYk/D5H+m0HF2qRDpz76Bj1zdmYofqspeJf4QJOyOpMSXFY3pgsohuKW
-P8YQ44cAkmMswFqMSKGi9EVnf6SVXWQFoHJhtlbUgi7ef/4IICrbtgSSE96OGdlg
-Sdoplu3n+1HClaYqlHbjkd/m0Hc8QvOjovctb0Zoclnlup+u2JH4rDNqjxFUvkWB
-8CeILjebgBrNRqAFDx7fKBEQyHs5FLOtUU1SwBLXXSyMCHuMhr/tKBHcbDgMhpVP
-IiIyYGyEGUoIR/er5AgIX9e6/zcQbc8OvY+gTu9t+tw+HIt8hGvUUkuYX8LB1k6r
-zf06e/iTT4GL6AhJtbh3
-=2hyW
------END PGP SIGNATURE-----
diff --git a/pam.spec b/pam.spec
index 1b3c744..9105b7a 100644
--- a/pam.spec
+++ b/pam.spec
@@ -4,12 +4,11 @@
 %define _pamconfdir %{_sysconfdir}/pam.d
 Name: pam
 Version: 1.5.3
-Release: 5
+Release: 6
 Summary: Pluggable Authentication Modules for Linux
-License: BSD and GPLv2+
+License: BSD-3-Clause AND GPL-2.0-or-later
 URL: http://www.linux-pam.org/
 Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz
-Source1: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz.asc
 Source5: other.pamd
 Source6: system-auth.pamd
 Source7: password-auth.pamd
@@ -42,24 +41,19 @@ handle the authentication tasks of applications (services) on the system.
 
 %package devel
 Summary: Development files for Linux-PAM
-Requires: pam = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 %{summary}.
 
-%package help
-Summary: Man pages for Linux-PAM
-BuildArch: noarch
-
-%description help
-%{summary}.
+%package_help
 
 %prep
 %autosetup -n Linux-PAM-%{version} -p1
-cp %{SOURCE18} .
-autoreconf -i
+cp %{S:18} .
 
 %build
+autoreconf -i
 %configure \
 	--disable-rpath \
 	--libdir=%{_pamlibdir} \
@@ -74,6 +68,7 @@ make -C po update-gmo
 
 %install
 %make_install
+%delete_la
 
 mkdir -p doc/README.d
 for readme in modules/pam_*/README ; do
@@ -105,21 +100,14 @@ done
 
 install -m644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/pam.conf
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -delete -print
 rm -fr $RPM_BUILD_ROOT/usr/share/doc/pam
 
 %find_lang Linux-PAM
 
 %check
-make check
-
-%post
-/sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%make_build check
 
 %files -f Linux-PAM.lang
-%defattr(-,root,root)
 %license Copyright COPYING gpl-2.0.txt 
 %doc AUTHORS README ChangeLog NEWS
 %doc doc/README.d/
@@ -163,7 +151,6 @@ make check
 %{_prefix}/lib/tmpfiles.d/pam.conf
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/security
 %{_libdir}/libpam.so
 %{_libdir}/libpamc.so
@@ -173,13 +160,13 @@ make check
 %{_libdir}/pkgconfig/pamc.pc
 
 %files help
-%defattr(-,root,root)
-%{_mandir}/man3/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Sat Aug 10 2024 Funda Wang <fundawang@yeah.net> - 1.5.3-6
+- cleanup spec
+
 * Tue Jul 23 2024 zhangxingrong <zhangxingrong@uniontech.cn> - 1.5.3-5
 - pam_shells: Plug econf memory leak
 - pam_selinux: fix formatting of audit messages
-- 
Gitee