From aab0da078e8ead7b7eb8cb9d315e3a97f5f5799ff12073245d8864c145469648 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 15 Sep 2020 23:39:37 +0000
Subject: [PATCH 1/2] - Demote Recommends to Suggests.

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=64
---
 pam_mount.changes | 5 +++++
 pam_mount.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pam_mount.changes b/pam_mount.changes
index d883070..7ed07a6 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 15 23:39:22 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Demote Recommends to Suggests.
+
 -------------------------------------------------------------------
 Mon Nov 25 08:24:18 UTC 2019 - Josef Möllers <josef.moellers@suse.com>
 
diff --git a/pam_mount.spec b/pam_mount.spec
index f3831cf..f96d6bf 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pam_mount
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@ License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 Group:          System/Libraries
 Version:        2.16
 Release:        0
-Url:            http://pam-mount.sf.net/
+URL:            http://pam-mount.sf.net/
 
 Source:         http://downloads.sf.net/pam-mount/%name-%version.tar.xz
 Source9:        http://downloads.sf.net/pam-mount/%name-%version.tar.asc
@@ -62,7 +62,7 @@ Requires:       fd0ssh
 Requires:       ofl
 # for mount(8) and mount.cifs:
 Requires:       util-linux >= 2.20
-Recommends:     cifs-mount
+Suggests:       cifs-mount
 
 %description
 This module is aimed at environments with central file servers that a

From c054c84c2186b3f2240bbcbc2ddd88d43c6566909bb34608c1ea92088f2f99dd Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 15 Sep 2020 23:51:32 +0000
Subject: [PATCH 2/2] - Trim old specfile constructs.

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=65
---
 pam_mount.changes |  1 +
 pam_mount.spec    | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pam_mount.changes b/pam_mount.changes
index 7ed07a6..63b7539 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -2,6 +2,7 @@
 Tue Sep 15 23:39:22 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
 - Demote Recommends to Suggests.
+- Trim old specfile constructs.
 
 -------------------------------------------------------------------
 Mon Nov 25 08:24:18 UTC 2019 - Josef Möllers <josef.moellers@suse.com>
diff --git a/pam_mount.spec b/pam_mount.spec
index f96d6bf..ab9959d 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -99,19 +99,16 @@ setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS
 and transparent use of the OS's crypto layer.
 
 %prep
-%setup -q
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
+%autosetup -p1
 
 %build
 %configure --disable-static --with-slibdir="/%_lib" \
 	--includedir="%_includedir/libcryptmount" \
 	%{?_with_selinux:--with-selinux}
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR="%buildroot";
+%make_install
 # Remove static and libtool version
 rm -f "%buildroot/%_lib/security"/*.{a,la} "%buildroot/%_libdir"/*.la
 #install the docs
@@ -146,12 +143,10 @@ then
 	done
 fi
 
-%post -n %lname -p /sbin/ldconfig
-
+%post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
 %_docdir/%name
 /%_lib/security/pam_mount*.so
 /sbin/mount.crypt*
@@ -169,11 +164,9 @@ fi
 %endif
 
 %files -n %lname
-%defattr(-,root,root)
 %_libdir/libcryptmount.so.0*
 
 %files -n libcryptmount-devel
-%defattr(-,root,root)
 %_includedir/libcryptmount/
 %_libdir/pkgconfig/*.pc
 %_libdir/libcryptmount.so