- BR sed 4.0, removed ldconfig (no libs in package), cosmetics

[packages/pwdutils.git] / pwdutils.spec

diff --git a/pwdutils.spec b/pwdutils.spec
index 80c2dcd812d9f0a18aa30b30f55ddd0a5fb61159..59343d3bccd7bc689de08c6f5f008c0b639a4e84 100644 (file)
--- a/pwdutils.spec
+++ b/pwdutils.spec
@@ -1,15 +1,12 @@
-# TODO:
-# - finish and test it
-#
 Summary:       Utilities to manage the passwd and shadow user information
 Summary(pl):   Narzêdzia do zarz±dzania informacjami o u¿ytkownikach z passwd i shadow
 Name:          pwdutils
-Version:       2.5.93
-Release:       2
+Version:       2.5.97
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
-# Source0-md5: 2886ac0bd345f1525121c5f8c840fd8b
+# Source0-md5: e221330372be7931bd80542082bafe4b
 Source1:       %{name}.useradd
 Source2:       %{name}.rpasswdd.init
 Source3:       %{name}.login.defs
@@ -27,10 +24,12 @@ BuildRequires:      libselinux-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
-Obsoletes:     shadow
-Obsoletes:     shadow-extras 
+BuildRequires: sed >= 4.0
 Provides:      shadow = 2:%{version}-%{release}
 Provides:      shadow-extras = 2:%{version}-%{release}
+Obsoletes:     shadow
+Obsoletes:     shadow-extras
+Conflicts:     util-linux < 2.12-10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -114,13 +113,10 @@ install %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/shadow
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 if [ ! -f /etc/shadow ]; then
        %{_sbindir}/pwconv
 fi
 
-%postun -p /sbin/ldconfig
-
 %post -n rpasswdd
 /sbin/chkconfig --add rpasswdd
 if [ -f /var/lock/subsys/rpasswdd ]; then
@@ -158,6 +154,7 @@ fi
 %attr(4755,root,root) %{_bindir}/chsh
 %attr(4755,root,root) %{_bindir}/expiry
 %attr(4755,root,root) %{_bindir}/gpasswd
+%attr(755,root,root) %{_bindir}/newgrp
 %attr(4755,root,root) %{_bindir}/passwd
 %attr(755,root,root) %{_bindir}/rpasswd
 %attr(755,root,root) %{_sbindir}/chpasswd
@@ -178,7 +175,6 @@ fi
 %attr(755,root,root) %{_sbindir}/vipw
 %{_mandir}/man?/*
 %exclude %{_mandir}/man8/rpasswdd*
-%exclude %{_mandir}/man1/newgrp*
 
 %files -n rpasswdd
 %defattr(644,root,root,755)