shadow-utils: Rename shadow to shadow-utils.

diff --git a/pkgs/shadow/login.defs b/pkgs/shadow-utils/login.defs
similarity index 100%
rename from pkgs/shadow/login.defs
rename to pkgs/shadow-utils/login.defs

diff --git a/pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch b/pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch
similarity index 100%
rename from pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch
rename to pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch

diff --git a/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch b/pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch
similarity index 100%
rename from pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch
rename to pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch

diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow-utils/shadow-utils.nm
similarity index 94%
rename from pkgs/shadow/shadow.nm
rename to pkgs/shadow-utils/shadow-utils.nm
index 401692b2b163baa74939269e1160d1fe35f50caf..712b6745108325dcb0157c158f622b771afbb4b9 100644 (file)
--- a/pkgs/shadow/shadow.nm
+++ b/pkgs/shadow-utils/shadow-utils.nm
@@ -24,17 +24,18 @@
 
 include $(PKGROOT)/Include
 
-PKG_NAME       = shadow
+PKG_NAME       = shadow-utils
 PKG_VER        = 4.1.4.3
-PKG_REL        = 5
+PKG_REL        = 1
 
-PKG_MAINTAINER =
-PKG_GROUPS     = System/Base
+PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
+PKG_GROUPS     = Base System/Base
 PKG_URL        = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = Utilities to deal with user accounts.
 
 PKG_BUILD_DEPS+= audit-devel libcap-devel libselinux-devel
+PKG_OBSOLETES += shadow
 
 define PKG_DESCRIPTION
        The shadow-utils package includes the necessary programs \
@@ -42,6 +43,7 @@ define PKG_DESCRIPTION
        format, plus programs for managing user and group accounts.
 endef
 
+THISAPP        = shadow-$(PKG_VER)
 PKG_TARBALL    = $(THISAPP).tar.bz2
 
 CONFIGURE_OPTIONS += \

diff --git a/pkgs/shadow/useradd.default b/pkgs/shadow-utils/useradd.default
similarity index 100%
rename from pkgs/shadow/useradd.default
rename to pkgs/shadow-utils/useradd.default