[flow-tools] Migrated away from fedora-usermgmt.
Jon Ciesla
limb at fedoraproject.org
Thu Apr 11 11:34:50 UTC 2013
commit 5183ab38a65a3ffdc65e0a7e454d0bf17aeba46e
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Apr 11 06:30:48 2013 -0500
Migrated away from fedora-usermgmt.
flow-tools.spec | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/flow-tools.spec b/flow-tools.spec
index 6ef4beb..6e17a04 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -8,7 +8,7 @@
Version: 0.68.5.1
Name: flow-tools
Summary: Tool set for working with NetFlow data
-Release: 7%{?dist}
+Release: 8%{?dist}
Group: Applications/System
License: BSD
URL: http://code.google.com/p/%{name}/
@@ -17,8 +17,8 @@ Source1: flow-capture.service
Source2: flow-capture.sysconfig
BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel
BuildRequires: bison flex tcp_wrappers-devel
-BuildRequires: fedora-usermgmt-devel doxygen
-%{?FE_USERADD_REQ}
+BuildRequires: doxygen
+Requires(pre): shadow-utils
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -120,9 +120,12 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
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
/sbin/ldconfig
@@ -234,6 +237,9 @@ fi
%doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
%changelog
+* Wed Apr 10 2013 Jon Ciesla <limburgher at gmail.com> - 0.68.5.1-8
+- Migrate from fedora-usermgmt to guideline scriptlets.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.68.5.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list