[ike] update to 2.2.0

[Marcel Wysocki]

commit a02ee6dc2a5c6fabd687a7ca2390c9d1e76a776d
Author: Marcel Wysocki <maci at satgnu.net>
Date:   Wed Apr 24 15:27:24 2013 +0200

    update to 2.2.0

 .gitignore  |    1 +
 ike.desktop |    2 +-
 ike.spec    |   37 ++++++++-----------------------------
 sources     |    2 +-
 4 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44d54c1..c68c793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ike-2.1.7-release.tbz2
+/ike-2.2.0-release.tgz
diff --git a/ike.desktop b/ike.desktop
index 7f35e00..1d4093b 100644
--- a/ike.desktop
+++ b/ike.desktop
@@ -2,7 +2,7 @@
 Name=Shrew Soft VPN Access Manager
 GenericName=Shrew Soft VPN Access Manager
 Comment=Application to manage remote VPN site configurations
-Exec=/usr/bin/ikea
+Exec=/usr/bin/qikea
 Icon=ikea
 Terminal=false
 Type=Application
diff --git a/ike.spec b/ike.spec
index 1603562..d4d5ebf 100644
--- a/ike.spec
+++ b/ike.spec
@@ -1,24 +1,17 @@
 Name:           ike
-Version:        2.1.7
-Release:        11%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Shrew Soft VPN Client For Linux
 Group:          Applications/Communications
 License:        Sleepycat
 URL:            http://www.shrew.net/
-Source0:        http://www.shrew.net/download/%{name}/%{name}-%{version}-release.tbz2
+Source0:        http://www.shrew.net/download/%{name}/%{name}-%{version}-release.tgz
 Source1:        iked.service
 Source2:        ike.desktop
 Source3:        ike.logrotate
-Patch0:         ike-2.1.7-cmake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  cmake flex bison qt3-devel openldap-devel openssl-devel
-BuildRequires:  desktop-file-utils
-#Requires(post): chkconfig
-#Requires(preun): chkconfig
-#Requires(preun): initscripts
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+BuildRequires:  cmake flex bison qt4-devel openldap-devel openssl-devel libedit-devel
+BuildRequires:  desktop-file-utils systemd
 
 
 %description
@@ -28,7 +21,6 @@ IPSEC VPN servers.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .cm
 
 sed -i 's:/var/log/:/var/log/iked/:' source/iked/iked.conf.sample
 sed -i 's/\r//' TODO.TXT
@@ -53,7 +45,7 @@ install -D -p -m0755 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/%{name}d.service
 mv $RPM_BUILD_ROOT%{_sysconfdir}/iked.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/iked.conf
 
 # Create desktop file
-install -p source/ikea/png/ikea.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}a.png
+install -p source/qikea/png/ikea.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}a.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
     %{SOURCE2}
 
@@ -65,10 +57,6 @@ install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %preun
-#if [ $1 = 0 ] ; then
-#    /sbin/service %{name}d stop >/dev/null 2>&1
-#    /sbin/chkconfig --del %{name}d
-#fi
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable iked.service > /dev/null 2>&1 || :
@@ -78,8 +66,6 @@ fi
 
 %post
 /sbin/ldconfig
-#/sbin/chkconfig --add %{name}d
-#/sbin/service %{name}d start >/dev/null 2>&1
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -88,9 +74,6 @@ fi
 
 %postun
 /sbin/ldconfig
-#if [ "$1" -ge "1" ] ; then
-#    /sbin/service %{name}d condrestart >/dev/null 2>&1 || :
-#fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
@@ -115,7 +98,6 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/ike
 %{_libdir}/*.so.*
 %{_libdir}/*.so
-#%%{_initrddir}/%%{name}d
 %{_unitdir}/%{name}d.service
 %{_bindir}/*
 %{_sbindir}/*
@@ -126,11 +108,8 @@ fi
 %dir %{_localstatedir}/log/%{name}d
 
 %changelog
-* Tue Apr 23 2013 Marcel Wysocki <maci at satgnu.net> - 2.1.7-11
-- fix .service file (#904782)
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Wed Apr 24 2013 Marcel Wysocki <maci at satgnu.net> - 2.2.0-1
+- Update to 2.2.0
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 7159bcf..b328fe0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc86e101809fc750013e18480c8c1040  ike-2.1.7-release.tbz2
+51da0d0170b6436f75ca1afe2ff8b74d  ike-2.2.0-release.tgz