From 705d185c4b527c60b191b0f006661062385ba06c Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Sun, 14 Jan 2007 13:49:46 +0000 Subject: [PATCH] correct previous wrong spec file commit --- shadow-utils.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/shadow-utils.spec b/shadow-utils.spec index 5d06039..4d001ed 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -2,10 +2,10 @@ %define WITH_SELINUX 1 %endif -Summary: Utilities for managing accounts and shadow password files. +Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.0.18.1 -Release: 7%{?dist} +Release: 9%{?dist} Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Patch9: shadow-4.0.18.1-gid.patch Patch10: shadow-4.0.18.1-overflow.patch Patch11: shadow-4.0.17-useradd.patch Patch12: shadow-4.0.18.1-appendOption.patch + License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -33,7 +34,6 @@ BuildRequires: audit-libs-devel >= 1.0.10 Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: libselinux >= 1.25.2-1 Requires: audit-libs >= 1.0.10 -Obsoletes: adduser %description The shadow-utils package includes the necessary programs for @@ -98,7 +98,8 @@ install -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/useradd ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser -ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 +#ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 +ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*}/man* ; do test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8 done @@ -163,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT %doc NEWS doc/HOWTO README %dir /etc/default %attr(0644,root,root) %config(noreplace) /etc/login.defs -%attr(0600,root,root) %config /etc/default/useradd +%attr(0600,root,root) %config(noreplace) /etc/default/useradd %{_bindir}/sg %{_bindir}/chage %{_bindir}/faillog @@ -220,9 +221,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/man8/faillog.8* %changelog -* Sun Jan 14 2007 Peter Vrabec 2:4.0.18.1-7 +* Sun Jan 14 2007 Peter Vrabec 2:4.0.18.1-9 - fix append option in usermod (#222540). +* Thu Dec 21 2006 Dan Walsh 2:4.0.18.1-8 +- Fix execution and creation of Home Directories under SELinux +- Resolves: rhbz#217441 + +* Thu Dec 14 2006 Peter Vrabec 2:4.0.18.1-7 +- fix rpmlint issues + * Wed Dec 06 2006 Peter Vrabec 2:4.0.18.1-6 - use MD5 encryption by default (#218629).