[tntnet/f18] Update to 2.1-14

[Martin Gansser]

commit 318ffd8ed0b79c267a8f7876bbc90d8c23c57520
Author: Martin Gansser <mgansser at alice.de>
Date:   Wed Aug 22 20:45:34 2012 +0200

    Update to 2.1-14

 .gitignore  |    1 +
 sources     |    1 +
 tntnet.spec |   24 +++++++-----------------
 3 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df94d3e..5198df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tntnet-2.1.tar.gz
+/tntnet.spec
diff --git a/sources b/sources
index a08f2d9..7d262b8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 a9c85aa6d624f7f88c48374f28730242  tntnet-2.1.tar.gz
+c306264fa7d27d37ed957571feb175e5  tntnet.spec
diff --git a/tntnet.spec b/tntnet.spec
index db28767..8351ac3 100644
--- a/tntnet.spec
+++ b/tntnet.spec
@@ -1,6 +1,6 @@
 Name:             tntnet
 Version:          2.1
-Release:          13%{?dist}
+Release:          14%{?dist}
 Summary:          A web application server for web applications
 
 # GPLv2+: framework/common/gcryptinit.c
@@ -64,26 +64,13 @@ getent passwd %{name} > /dev/null || \
 exit 0
 
 %post
-/sbin/ldconfig
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post %{name}.service
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
+%systemd_preun %{name}.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 %{name}.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart %{name}.service
 
 %files
 %defattr (-, root, root)
@@ -114,6 +101,9 @@ fi
 %{_includedir}/tnt/
 
 %changelog
+* Thu Aug 22 2012 Martin Gansser <linux4martin at gmx.de> - 2.1-14
+- fix for "Introduce new systemd-rpm macros in bwbar spec file" (#850341)
+
 * Thu Jul 26 2012 Martin Gansser <linux4martin at gmx.de> - 2.1-13
 - added missing BuildRequires systemd-units