From b1491878079a469a6568d488d22bbb04e6aeaea53d1af18b4923c9874141c94c Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 31 May 2019 06:00:55 +0000
Subject: [PATCH] Accepting request 706498 from
 home:pluskalm:branches:Base:System

- Make building more verbose
- Use spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/706498
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=66
---
 shadow.changes |  6 ++++
 shadow.spec    | 92 +++++++++++++++++++++++++-------------------------
 2 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/shadow.changes b/shadow.changes
index a374ef1..f40c32d 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 30 11:15:49 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
+
+- Make building more verbose
+- Use spec-cleaner
+
 -------------------------------------------------------------------
 Thu May  2 09:45:48 UTC 2019 - lnussel@suse.de
 
diff --git a/shadow.spec b/shadow.spec
index 0c19d14..59e3ec8 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -22,7 +22,7 @@ Release:        0
 Summary:        Utilities to Manage User and Group Accounts
 License:        BSD-3-Clause AND GPL-2.0-or-later
 Group:          System/Base
-Url:            https://github.com/shadow-maint/shadow
+URL:            https://github.com/shadow-maint/shadow
 Source:         https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
 Source1:        pamd.tar.bz2
 Source2:        README.changes-pwdutils
@@ -77,8 +77,8 @@ BuildRequires:  pam-devel
 BuildRequires:  xz
 Requires(pre):  group(root)
 Requires(pre):  group(shadow)
+Requires(pre):  permissions
 Requires(pre):  user(root)
-PreReq:         permissions
 Provides:       pwdutils = 3.2.20
 Obsoletes:      pwdutils <= 3.2.19
 # Virtual provides for supported variables in login.defs.
@@ -123,23 +123,23 @@ export LDFLAGS="-pie"
 
 autoreconf -fvi
 %configure \
-        --disable-shadowgrp \
-	--enable-account-tools-setuid \
-        --with-audit \
-        --with-libpam \
-        --with-sha-crypt \
-	--with-acl \
-	--with-attr \
-	--with-nscd \
-        --with-selinux \
-        --without-libcrack \
-        --disable-shared \
-	--with-group-name-max-length=32
-make
+  --disable-shadowgrp \
+  --enable-account-tools-setuid \
+  --with-audit \
+  --with-libpam \
+  --with-sha-crypt \
+  --with-acl \
+  --with-attr \
+  --with-nscd \
+  --with-selinux \
+  --without-libcrack \
+  --disable-shared \
+  --with-group-name-max-length=32
+make %{?_smp_mflags} V=1
 
 %install
 cp %{SOURCE2} .
-make install DESTDIR=%{buildroot} gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
+%make_install gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
 
 # install useradd.local, userdel.local, ...
 install -m 0755 %{SOURCE3} %{buildroot}/%{_sbindir}/
@@ -291,36 +291,36 @@ rm -rf %{buildroot}%{_mandir}/{??,??_??}
 %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/useradd.local
 %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/userdel-pre.local
 %verify(not md5 size mtime) %config(noreplace) %{_sbindir}/userdel-post.local
-%{_mandir}/man1/chage.1*
-%{_mandir}/man1/chfn.1*
-%{_mandir}/man1/chsh.1*
-%{_mandir}/man1/expiry.1*
-%{_mandir}/man1/gpasswd.1*
-%{_mandir}/man1/newgrp.1*
-%{_mandir}/man1/passwd.1*
-%{_mandir}/man1/sg.1*
-%{_mandir}/man3/shadow.3*
-%{_mandir}/man5/login.defs.5*
-%{_mandir}/man5/shadow.5*
-%{_mandir}/man8/chpasswd.8*
-%{_mandir}/man8/groupadd.8*
-%{_mandir}/man8/groupdel.8*
-%{_mandir}/man8/groupmod.8*
-%{_mandir}/man8/grpck.8*
-%{_mandir}/man8/lastlog.8*
-%{_mandir}/man8/newusers.8*
-%{_mandir}/man8/pwck.8*
-%{_mandir}/man8/pwconv.8*
-%{_mandir}/man8/pwunconv.8*
-%{_mandir}/man8/useradd.8*
-%{_mandir}/man8/userdel.8*
-%{_mandir}/man8/usermod.8*
-%{_mandir}/man8/vigr.8*
-%{_mandir}/man8/vipw.8*
-%{_mandir}/man5/subuid.5*
-%{_mandir}/man5/subgid.5*
-%{_mandir}/man1/newgidmap.1*
-%{_mandir}/man1/newuidmap.1*
+%{_mandir}/man1/chage.1%{?ext_man}
+%{_mandir}/man1/chfn.1%{?ext_man}
+%{_mandir}/man1/chsh.1%{?ext_man}
+%{_mandir}/man1/expiry.1%{?ext_man}
+%{_mandir}/man1/gpasswd.1%{?ext_man}
+%{_mandir}/man1/newgrp.1%{?ext_man}
+%{_mandir}/man1/passwd.1%{?ext_man}
+%{_mandir}/man1/sg.1%{?ext_man}
+%{_mandir}/man3/shadow.3%{?ext_man}
+%{_mandir}/man5/login.defs.5%{?ext_man}
+%{_mandir}/man5/shadow.5%{?ext_man}
+%{_mandir}/man8/chpasswd.8%{?ext_man}
+%{_mandir}/man8/groupadd.8%{?ext_man}
+%{_mandir}/man8/groupdel.8%{?ext_man}
+%{_mandir}/man8/groupmod.8%{?ext_man}
+%{_mandir}/man8/grpck.8%{?ext_man}
+%{_mandir}/man8/lastlog.8%{?ext_man}
+%{_mandir}/man8/newusers.8%{?ext_man}
+%{_mandir}/man8/pwck.8%{?ext_man}
+%{_mandir}/man8/pwconv.8%{?ext_man}
+%{_mandir}/man8/pwunconv.8%{?ext_man}
+%{_mandir}/man8/useradd.8%{?ext_man}
+%{_mandir}/man8/userdel.8%{?ext_man}
+%{_mandir}/man8/usermod.8%{?ext_man}
+%{_mandir}/man8/vigr.8%{?ext_man}
+%{_mandir}/man8/vipw.8%{?ext_man}
+%{_mandir}/man5/subuid.5%{?ext_man}
+%{_mandir}/man5/subgid.5%{?ext_man}
+%{_mandir}/man1/newgidmap.1%{?ext_man}
+%{_mandir}/man1/newuidmap.1%{?ext_man}
 
 %{_unitdir}/*