[ike/f18] minor changelog fix

[Marcel Wysocki]

commit df886caa687d76741d48719d729cbd3b5d20e6ad
Author: Marcel Wysocki <maci at satgnu.net>
Date:   Thu Jun 6 08:00:33 2013 +0200

    minor changelog fix

 ike.spec |   47 ++++++++++++++++++-----------------------------
 1 files changed, 18 insertions(+), 29 deletions(-)
---
diff --git a/ike.spec b/ike.spec
index ac64a90..3061b99 100644
--- a/ike.spec
+++ b/ike.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           ike
-Version:        2.2.0
-Release:        5%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Shrew Soft VPN Client For Linux
 Group:          Applications/Communications
 License:        Sleepycat
@@ -11,12 +11,15 @@ Source0:        http://www.shrew.net/download/%{name}/%{name}-%{version}-release
 Source1:        iked.service
 Source2:        ike.desktop
 Source3:        ike.logrotate
-#already fixed in upstream HEAD
-Patch0:         pid.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cmake flex bison qt4-devel openldap-devel openssl-devel libedit-devel
 BuildRequires:  desktop-file-utils systemd
 
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
 
 %description
 This free IPSEC VPN client can be used to communicate with 
@@ -26,8 +29,6 @@ IPSEC VPN servers.
 %prep
 %setup -q -n %{name}
 
-%patch0 -p0
-
 sed -i 's:/var/log/:/var/log/iked/:' source/iked/iked.conf.sample
 sed -i 's/\r//' TODO.TXT
 
@@ -59,32 +60,14 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable iked.service > /dev/null 2>&1 || :
-    /bin/systemctl stop iked.service > /dev/null 2>&1 || :
-fi
-
-
 %post
-/sbin/ldconfig
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post iked.service
 
+%preun
+%systemd_preun iked.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 iked.service >/dev/null 2>&1 || :
-fi
+%systemd_postun iked.service 
 
 %triggerun -- ike < 2.1.7-8
 # Save the current service runlevel info
@@ -114,13 +97,19 @@ fi
 %dir %{_localstatedir}/log/%{name}d
 
 %changelog
+* Wed Jun 05 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.1-1
+- update to 2.2.1
+- use systemd macros (fedora 18+)
+- remove obsolete patch
+- spec cleanups
+
 * Thu May 09 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.0-5
 - #961083: enable PIE (http://fedoraproject.org/wiki/Packaging:Guidelines#PIE)
 
 * Fri Apr 26 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.0-4
 - fix bug that occurs when no pid is given at the command line
 
-* Wed Apr 24 2013 root - 2.2.0-3
+* Wed Apr 24 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.0-3
 - fix logrotate script
 
 * Wed Apr 24 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.0-2