[kde-plasma-networkmanagement] * Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.42.20110323 - Conditionalize NM 0.9

[Kevin Kofler]

commit f2ab680968ab3839ed817a528f828ec05a891715
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Mar 25 11:27:32 2011 +0100

    * Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.42.20110323
    - Conditionalize NM 0.9 (with compat patches) support to F15+
    - Merge VPN subpackages into the main package for F15+ to match NM 0.9 packaging
    - BR NetworkManager-devel instead of NetworkManager-glib-devel on F15+

 kde-plasma-networkmanagement.spec |   61 +++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 26 deletions(-)
---
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 728f15f..f1175e8 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,10 +1,14 @@
 
 %define snap 20110323
 
+%if 0%{?fedora} > 14
+%global nm09 1
+%endif
+
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.41.%{snap}%{?dist}
+Release:        0.42.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -30,7 +34,12 @@ BuildRequires:  kdelibs4-devel >= 4.5.0
 BuildRequires:  kdebase-workspace-devel
 # really just a runtime dep, meh -- Rex
 BuildRequires:  mobile-broadband-provider-info-devel
-BuildRequires:  NetworkManager-glib-devel >= 0.8.997
+%if 0%{?nm09}
+BuildRequires:  NetworkManager-devel >= 0.8.997
+%else
+# -glib-devel to work around https://bugzilla.redhat.com/show_bug.cgi?id=685442
+BuildRequires:  NetworkManager-glib-devel >= 0.7.0
+%endif
 BuildRequires:  PolicyKit-devel
 BuildRequires:  qt4-devel
 BuildRequires:  gettext
@@ -80,14 +89,6 @@ Provides:       knetworkmanager-pptp = %{?epoch:%{epoch}:}%{version}-%{release}
 %description pptp
 %{summary}.
 
-%package strongswan
-Summary:        strongswan support for %{name}
-Group:          Applications/Internet
-Requires:       %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       strongswan 
-%description strongswan
-%{summary}.
-
 %package vpnc
 Summary:        Vpnc support for %{name} 
 Group:          Applications/Internet
@@ -101,7 +102,9 @@ Provides:       knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %prep
 %setup -q -n networkmanagement-%{version}
+%if 0%{?nm09}
 %patch0 -p1 -b .nm09-compat
+%endif
 
 # nuke monolithic knm bits
 rm -rfv monolithic po/*/knetworkmanager.po
@@ -183,39 +186,45 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 %{_kde4_libdir}/kde4/kcm_networkmanagement.so
 %{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
 
-
-%files libs -f libknetworkmanager.lang
-%defattr(-,root,root,-)
-%{_kde4_libdir}/libknmclient.so.4*
-%{_kde4_libdir}/libknminternals.so.4*
-%{_kde4_libdir}/libknmservice.so.4*
-%{_kde4_libdir}/libknmui.so.4*
-# Unversioned libraries
-%{_kde4_libdir}/libknm_nm.so
-%{_kde4_libdir}/libsolidcontrolfuture.so
-
+%if !0%{?nm09}
 %files openvpn
 %defattr(-,root,root,-)
+%endif
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-#files novellvpn
-#defattr(-,root,root,-)
-#{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
-#{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.desktop
-
+%if !0%{?nm09}
 %files vpnc
 %defattr(-,root,root,-)
+%endif
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
 
+%if !0%{?nm09}
 %files pptp
 %defattr(-,root,root,-)
+%endif
 %{_kde4_libdir}/kde4/networkmanagement_pptpui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
 
 
+%files libs -f libknetworkmanager.lang
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libknmclient.so.4*
+%{_kde4_libdir}/libknminternals.so.4*
+%{_kde4_libdir}/libknmservice.so.4*
+%{_kde4_libdir}/libknmui.so.4*
+# Unversioned libraries
+%{_kde4_libdir}/libknm_nm.so
+%{_kde4_libdir}/libsolidcontrolfuture.so
+
+
 %changelog
+* Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.42.20110323
+- Conditionalize NM 0.9 (with compat patches) support to F15+
+- Merge VPN subpackages into the main package for F15+ to match NM 0.9 packaging
+- BR NetworkManager-devel instead of NetworkManager-glib-devel on F15+
+
 * Thu Mar 24 2011 Dan Williams <dcbw at redhat.com> 1:0.9-0.41.20110323
 - Rebuild with NM 0.9 compat patch