From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 4 May 2004 19:36:06 +0000 (+0000)
Subject: - pwdutils replaces shadow+shadow-extras, so base C: pwdutils, -extras O: pwdutils
X-Git-Tag: auto/ac/shadow-4_0_4_1-3~3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=fbb1641513d7cd40d28d217009ac6e5b27d597cf;p=packages%2Fshadow.git

- pwdutils replaces shadow+shadow-extras, so base C: pwdutils, -extras O: pwdutils

Changed files:
    shadow.spec -> 1.98
---

diff --git a/shadow.spec b/shadow.spec
index 97a265b..a6cd6b2 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -40,15 +40,15 @@ BuildRequires:	gettext-devel >= 0.12.1
 BuildRequires:	pam-devel
 BuildRequires:	libtool
 %{?with_selinux:BuildRequires:	libselinux-devel}
-Provides:	shadow-utils
-Provides:	passwd
 Requires:	pam >= 0.77.3
 # to force proper coreutils version, so "groups" command exists
 Requires:	/usr/bin/groups
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:	passwd
+Provides:	shadow-utils
 Obsoletes:	passwd
-Obsoletes:	pwdutils
 Obsoletes:	shadow-utils
+Conflicts:	pwdutils
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package includes the programs necessary to convert standard UNIX
@@ -116,6 +116,7 @@ Summary:	shadow - not often used programs
 Summary(pl):	shadow - programy nieczêsto u¿ywane
 Group:		Applications/System
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	pwdutils
 Conflicts:	util-linux < 2.12-10
 
 %description extras