[kde-plasma-networkmanagement] upstream patch to fix build for older openconnect

[Rex Dieter]

commit efb1affb4e44e0a041bfb7baf69380c7926b6261
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 18 13:00:15 2012 -0500

    upstream patch to fix build for older openconnect

 ...rror-when-processing-openconnect-plugin-s.patch |   55 ++++++++++++++++++++
 kde-plasma-networkmanagement.spec                  |   11 +++-
 2 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-cmake-error-when-processing-openconnect-plugin-s.patch b/0001-Fix-cmake-error-when-processing-openconnect-plugin-s.patch
new file mode 100644
index 0000000..ef59703
--- /dev/null
+++ b/0001-Fix-cmake-error-when-processing-openconnect-plugin-s.patch
@@ -0,0 +1,55 @@
+From c2f59f94884a90c38a15dae684bfad4c7d33f83b Mon Sep 17 00:00:00 2001
+From: "Lamarque V. Souza" <lamarque at kde.org>
+Date: Mon, 18 Jun 2012 12:36:48 -0300
+Subject: [PATCH] Fix cmake error when processing openconnect plugin's
+ CMakeLists.txt.
+
+---
+ plasma_nm_version.h                   |    2 +-
+ vpnplugins/openconnect/CMakeLists.txt |   18 ++++++++----------
+ 2 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/plasma_nm_version.h b/plasma_nm_version.h
+index 80e88fd..dd45b3e 100644
+--- a/plasma_nm_version.h
++++ b/plasma_nm_version.h
+@@ -1,4 +1,4 @@
+ #ifndef PLASMA_NM_VERSION_H
+ #define PLASMA_NM_VERSION_H
+-static const char * plasmaNmVersion = "0.9.0.3 (nm09 20120617)";
++static const char * plasmaNmVersion = "0.9.0.3 (nm09 20120618)";
+ #endif
+diff --git a/vpnplugins/openconnect/CMakeLists.txt b/vpnplugins/openconnect/CMakeLists.txt
+index 31f0c18..9fd7be6 100644
+--- a/vpnplugins/openconnect/CMakeLists.txt
++++ b/vpnplugins/openconnect/CMakeLists.txt
+@@ -3,18 +3,16 @@ set (MINIMUM_OPENCONNECT_VERSION_REQUIRED "3.99")
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
+ 
+ macro_optional_find_package(OpenConnect ${MINIMUM_OPENCONNECT_VERSION_REQUIRED})
+-if (${OPENCONNECT_VERSION})
+-  if (${OPENCONNECT_VERSION} VERSION_LESS "3.99")
+-    macro_optional_find_package(OpenSSL)
+-    macro_log_feature(OPENSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management")
+-    if (OPENSSL_FOUND)
+-       set (MINIMUM_OPENCONNECT_VERSION_REQUIRED "3.03")
+-       set (maybe_OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES})
++if (OPENCONNECT_FOUND)
++    if (${OPENCONNECT_VERSION} VERSION_LESS "3.99")
++        macro_optional_find_package(OpenSSL)
++        macro_log_feature(OPENSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management")
++        if (OPENSSL_FOUND)
++            set (MINIMUM_OPENCONNECT_VERSION_REQUIRED "3.03")
++            set (maybe_OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES})
++        endif()
+     endif()
+-  endif()
+-endif()
+ 
+-if (OPENCONNECT_FOUND)
+     if (${OPENCONNECT_VERSION} VERSION_GREATER ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} OR
+         ${OPENCONNECT_VERSION} VERSION_EQUAL ${MINIMUM_OPENCONNECT_VERSION_REQUIRED})
+ 
+-- 
+1.7.10.4
+
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 30f7e9b..4306a2d 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,7 +1,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -18,6 +18,9 @@ Source10: 00-fedora-networkmanagement.js
 # https://bugs.kde.org/show_bug.cgi?id=299868
 Patch1: networkmanagement-0.9.0.3-wpa2ent_dialog.patch
 
+## upstream patches
+Patch100: 0001-Fix-cmake-error-when-processing-openconnect-plugin-s.patch
+
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
@@ -27,7 +30,7 @@ BuildRequires:  mobile-broadband-provider-info-devel
 BuildRequires:  pkgconfig(NetworkManager) >= 0.9.0
 BuildRequires:  pkgconfig(libnm-glib) pkgconfig(libnm-util) 
 %if 0%{?fedora} || 0%{?epel}
-BuildRequires:  pkgconfig(openconnect) >= 3.99
+BuildRequires:  pkgconfig(openconnect) >= 3.11
 %endif
 
 # multilib upgrades
@@ -99,6 +102,7 @@ Requires:       NetworkManager-openconnect
 %setup -q -n networkmanagement-%{version}
 
 %patch1 -p1 -b wpa2ent_dialog
+%patch100 -p1 -b .older_openconnect_ftbfs
 
 
 %build
@@ -226,6 +230,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Mon Jun 18 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.0.3-2
+- upstream patch to fix build for older openconnect
+
 * Mon Jun 18 2012 Rex Dieter <rdieter at fedoraproject.org>
 - 0.9.0.3-1
 - update to 0.9.0.3