[gridengine] Migrated away from fedora-usermgmt.

Jon Ciesla limb at fedoraproject.org
Thu Apr 11 11:36:07 UTC 2013


commit 993b8a33ebfdb0f1ce16afe3085e1dc946b8cd97
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 11 06:32:03 2013 -0500

    Migrated away from fedora-usermgmt.

 gridengine.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/gridengine.spec b/gridengine.spec
index d16f45d..dc6ed0b 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -12,7 +12,7 @@
 
 Name:    gridengine
 Version: 2011.11p1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -70,7 +70,6 @@ BuildRequires: lesstif-devel
 %endif
 BuildRequires: java-devel >= 1.6.0, javacc, ant-junit, ant-nodeps
 BuildRequires: elfutils-libelf-devel, net-tools
-BuildRequires: fedora-usermgmt-devel
 BuildRequires: groff
 %if 0%{?fedora}
 BuildRequires: hostname
@@ -84,7 +83,7 @@ Requires: binutils
 Requires: ncurses
 Requires(posttrans): /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
-%{?FE_USERADD_REQ}
+Requires(pre): shadow-utils
 
 
 %description
@@ -420,9 +419,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-%__fe_groupadd %uid -r %username &>/dev/null || :
-%__fe_useradd  %uid -r -s /sbin/nologin -d %homedir -M          \
-                    -c '%gecos' -g %username %username &>/dev/null || :
+getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid}
+getent passwd %{username} >/dev/null || \
+    useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -u %{uid} \
+    -c '%{gecos}' %{username}
+exit 0
+
 
 %post -p /sbin/ldconfig
 
@@ -647,6 +649,9 @@ fi
 
 
 %changelog
+* Wed Apr 10 2013 Jon Ciesla <limburgher at gmail.com> - 2011.11p1-8
+- Migrate from fedora-usermgmt to guideline scriptlets.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.11p1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list