- rel 3; no compat symlinks, old/pwdutils compatible location by default

[packages/shadow.git] / shadow.spec

diff --git a/shadow.spec b/shadow.spec
index 42a9459d6ded6aa7ffe1530617f80e6d768e1e37..84c434416e538a2f90858ec9e3ccba5ed9c98113 100644 (file)
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,26 +1,5 @@
 # TODO
-# - /etc/login.defs contains options valid only when PAM is disabled:
-# gpasswd -M chef_server chef_server
-#configuration error - unknown item 'FAILLOG_ENAB' (notify administrator)
-#configuration error - unknown item 'LASTLOG_ENAB' (notify administrator)
-#configuration error - unknown item 'MAIL_CHECK_ENAB' (notify administrator)
-#configuration error - unknown item 'OBSCURE_CHECKS_ENAB' (notify administrator)
-#configuration error - unknown item 'PORTTIME_CHECKS_ENAB' (notify administrator)
-#configuration error - unknown item 'QUOTAS_ENAB' (notify administrator)
-#configuration error - unknown item 'MOTD_FILE' (notify administrator)
-#configuration error - unknown item 'FTMP_FILE' (notify administrator)
-#configuration error - unknown item 'NOLOGINS_FILE' (notify administrator)
-#configuration error - unknown item 'ENV_HZ' (notify administrator)
-#configuration error - unknown item 'PASS_MIN_LEN' (notify administrator)
-#configuration error - unknown item 'SU_WHEEL_ONLY' (notify administrator)
-#configuration error - unknown item 'CRACKLIB_DICTPATH' (notify administrator)
-#configuration error - unknown item 'PASS_CHANGE_TRIES' (notify administrator)
-#configuration error - unknown item 'PASS_ALWAYS_WARN' (notify administrator)
-#configuration error - unknown item 'CHFN_AUTH' (notify administrator)
-#configuration error - unknown item 'ENVIRON_FILE' (notify administrator)
-# - sync pam files from pwdutils
 # - tcb support?
-# - ensure Conflicts with various packages (util-linux,sysvinit,coreutils) is up to date
 
 # Conditional build:
 %bcond_without selinux         # build without SE-Linux support
@@ -34,15 +13,13 @@ Summary(pl.UTF-8):  Narzędzia do obsługi mechanizmu ukrytych haseł
 Summary(pt_BR.UTF-8):  Utilitários para o arquivo de senhas Shadow
 Summary(tr.UTF-8):     Gölge parola dosyası araçları
 Name:          shadow
-Version:       4.6
-#BuildRequires:        useradd -g is broken, use pwdutils, or fix it:
-# http://zie.pg.gda.pl/mailman/pipermail/shadow/2006-September/000395.html
-Release:       1
+Version:       4.8
+Release:       3
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       https://github.com/shadow-maint/shadow/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: b491fecbf1232632c32ff8f1437fd60e
+# Source0-md5: 723ebb19b06e2f52d9ed7f0653483851
 Source2:       %{name}-login.defs
 Source3:       %{name}.useradd
 Source10:      chage.pamd
@@ -155,15 +132,15 @@ in user namespaces.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1 UPSTREAM or drop
 
 %build
 # NOTE:
 # - cracklib option refers to non-PAM passwd code
 # - skey referes to non-PAM pw_auth/passwd_check (login, su, chfn, chsh) code
 %configure \
-       --bindir=/bin \
-       --sbindir=/sbin \
+       --bindir=%{_bindir} \
+       --sbindir=%{_sbindir} \
        --enable-shadowgrp \
        %{?with_shared:--enable-shared --disable-static} \
        --disable-silent-rules \
@@ -210,7 +187,7 @@ cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/pam.d/usermod
 > $RPM_BUILD_ROOT/etc/security/chfn.allow
 > $RPM_BUILD_ROOT/etc/security/chsh.allow
 
-%{__rm} $RPM_BUILD_ROOT/{etc/pam.d,bin}/{login,su}
+%{__rm} $RPM_BUILD_ROOT/{etc/pam.d,%{_bindir}}/{login,su}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/{login,su}.1*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man3/*.3*
 
@@ -218,10 +195,10 @@ cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/pam.d/usermod
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/lastlog
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man8/lastlog.8*
 # packaged in coreutils
-%{__rm} $RPM_BUILD_ROOT/bin/groups
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/groups
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/groups.1*
 # packaged in util-linux
-%{__rm} $RPM_BUILD_ROOT/sbin/nologin
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/nologin
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/nologin.8*
 
 %find_lang %{name}
@@ -240,7 +217,6 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS TODO doc/{HOWTO,WISHLIST}
-%attr(750,root,root) %dir %{_sysconfdir}/default
 %attr(640,root,root) %config %verify(not md5 mtime size) %{_sysconfdir}/default/useradd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chage
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chfn