[NetworkManager-openswan/f19] Rebase to latest upstream version 0.9.8.0

[avesh]

commit 5dc9101d13b821ebea6f3a20c38ef9df03c2e7d0
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Mon Aug 5 18:38:51 2013 -0400

    Rebase to latest upstream version 0.9.8.0
    
    - Fixed several issues with the packaging

 .gitignore                      |    2 +
 NetworkManager-openswan.spec    |   23 +-
 nm-openswan-845599-865883.patch |   40 --
 nm-openswan-changes.patch       |  871 ---------------------------------------
 sources                         |    3 +-
 5 files changed, 13 insertions(+), 926 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09f016e..6f4e6a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 NetworkManager-openswan-0.8.tar.gz
+/NetworkManager-openswan-0.9.8.0.sha256sum
+/NetworkManager-openswan-0.9.8.0.tar.xz
diff --git a/NetworkManager-openswan.spec b/NetworkManager-openswan.spec
index 1131d2c..5c4f89d 100644
--- a/NetworkManager-openswan.spec
+++ b/NetworkManager-openswan.spec
@@ -1,27 +1,22 @@
 %define nm_version        1:0.9.2
-%define openswan_version  2.6.27-1
 
-%define snapshot .git20120302
-%define realversion 0.9.3.995
+%define realversion 0.9.8.0
 
 Summary:   NetworkManager VPN plug-in for openswan
 Name:      NetworkManager-openswan
-Version:   0.9.3.995
-Release:   5%{snapshot}%{?dist}
+Version:   0.9.8.0
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/0.9/
-Source0:    http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/0.9/%{name}-%{realversion}%{snapshot}.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/0.9/%{name}-%{realversion}.tar.xz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch1: nm-openswan-changes.patch
-Patch2: nm-openswan-845599-865883.patch
-
 BuildRequires: gtk3-devel
 BuildRequires: dbus-devel
 BuildRequires: NetworkManager-devel       >= %{nm_version}
 BuildRequires: NetworkManager-glib-devel  >= %{nm_version}
-%if 0%{?fedora} > 16
+%if 0%{?fedora} > 16 || 0%{?rhel} >= 7
 BuildRequires: libgnome-keyring-devel
 %else
 BuildRequires: gnome-keyring-devel
@@ -30,7 +25,6 @@ BuildRequires: intltool gettext
 
 Requires: NetworkManager   >= %{nm_version}
 Requires: gnome-keyring
-Requires: openswan  >= %{openswan_version}
 
 %description
 This package contains software for integrating the openswan VPN software
@@ -39,9 +33,6 @@ with NetworkManager and the GNOME desktop
 %prep
 %setup -q  -n NetworkManager-openswan-%{realversion}
 
-%patch1 -p1
-%patch2 -p1
-
 %build
 %configure --disable-static --enable-more-warnings=yes
 make %{?_smp_mflags}
@@ -74,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/gnome-vpn-properties/openswan
 
 %changelog
+* Mon Aug 5 2013 Avesh Agarwal <avagarwa at redhat.com> - 0.9.8.0-1
+- Rebase to latest upstream version 0.9.8.0
+- Fixed several issues with the packaging
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.995-5.git20120302
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index c728c43..1e85c40 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0a7393fc3bc9e7c3ca48a4f0a352c4fe  NetworkManager-openswan-0.9.3.995.git20120302.tar.bz2
+70281754557a11eef344ecbc7f88b4ce  NetworkManager-openswan-0.9.8.0.sha256sum
+6a373868f85ac3b7c953f7fd6c76e637  NetworkManager-openswan-0.9.8.0.tar.xz