orion pushed to flow-tools (epel7). "bz#850114"

[notifications at fedoraproject.org]

>From ddd76e7ffe85a63e6f460890775b7f68e5aca2a2 Mon Sep 17 00:00:00 2001
From: "Paul P. Komkoff" <i at stingr.net>
Date: Sat, 21 Dec 2013 17:06:06 +0400
Subject: bz#850114


diff --git a/flow-tools.spec b/flow-tools.spec
index dc4d4ef..3dcf140 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -7,7 +7,7 @@
 Version: 0.68.5.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
@@ -19,11 +19,10 @@ BuildRequires: bison flex tcp_wrappers-devel
 BuildRequires: doxygen
 Requires(pre): shadow-utils
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-# For triggerun
-Requires(post): systemd-sysv
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: systemd
 Provides: group(%username)
 Provides: user(%username)
 
@@ -128,35 +127,13 @@ exit 0
 
 %post
 /sbin/ldconfig
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post flow-capture.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable flow-capture.service > /dev/null 2>&1 || :
-    /bin/systemctl stop flow-capture.service > /dev/null 2>&1 || :
-fi
+%systemd_preun flow-capture.service
 
 %postun
-/sbin/ldconfig
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- flow-tools < 0.68.5.1-5
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply flow-capture
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save flow-capture >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del flow-capture >/dev/null 2>&1 || :
-/bin/systemctl try-restart flow-capture.service >/dev/null 2>&1 || :
+%systemd_postun
 
 %files 
 %defattr(-,root,root)
@@ -236,6 +213,9 @@ fi
 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
 
 %changelog
+* Sat Dec 21 2013 Paul Komkoff <i at stingr.net> - 0.68.5.1-12
+- bz#850114
+
 * 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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=ddd76e7ffe85a63e6f460890775b7f68e5aca2a2