orion pushed to flow-tools (epel7). "bz#1013218"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 21:36:26 UTC 2015
>From 1b3ef19a212336afd51b3ca821e381f5865a9852 Mon Sep 17 00:00:00 2001
From: "Paul P. Komkoff" <i at stingr.net>
Date: Sat, 28 Sep 2013 21:41:33 +0400
Subject: bz#1013218
diff --git a/flow-tools.spec b/flow-tools.spec
index deb2b6a..dc4d4ef 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -1,6 +1,5 @@
%bcond_without fedora
-%global uid 40
%global username flow-tools
%global homedir %{_localstatedir}/%{name}
%global gecos "Network flow monitoring"
@@ -8,7 +7,7 @@
Version: 0.68.5.1
Name: flow-tools
Summary: Tool set for working with NetFlow data
-Release: 10%{?dist}
+Release: 11%{?dist}
Group: Applications/System
License: BSD
URL: http://code.google.com/p/%{name}/
@@ -25,8 +24,8 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
# For triggerun
Requires(post): systemd-sysv
-Provides: group(%username) = %uid
-Provides: user(%username) = %uid
+Provides: group(%username)
+Provides: user(%username)
%description
@@ -120,9 +119,9 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
rm -rf $RPM_BUILD_ROOT
%pre
-getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid}
+getent group %{username} >/dev/null || groupadd -r %{username}
getent passwd %{username} >/dev/null || \
- useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -u %{uid} \
+ useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
-c '%{gecos}' %{username}
exit 0
@@ -237,6 +236,9 @@ fi
%doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
%changelog
+* Sat Sep 28 2013 Paul Komkoff <i at stingr.net> - 0.68.5.1-11
+- Try to fix bz#1013218 as per https://fedoraproject.org/wiki/Packaging:UsersAndGroups
+
* Fri Aug 23 2013 i at stingr.net - 0.68.5.1-10
- Try to fix bz#929362
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=1b3ef19a212336afd51b3ca821e381f5865a9852
More information about the scm-commits
mailing list