rpms/kde-plasma-networkmanagement/F-13 .cvsignore, 1.6, 1.7 kde-plasma-networkmanagement.spec, 1.37, 1.38 sources, 1.19, 1.20

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6235

Modified Files:
	.cvsignore kde-plasma-networkmanagement.spec sources 
Log Message:
* Thu Apr 01 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.18.20100401
- 20100401 snapshot
- (re)add warning about plasma applet stability



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	10 Mar 2010 16:17:11 -0000	1.6
+++ .cvsignore	1 Apr 2010 15:25:29 -0000	1.7
@@ -1 +1 @@
-networkmanagement-0.9-20100310.tar.bz2
+networkmanagement-0.9-20100401.tar.bz2


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/kde-plasma-networkmanagement.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- kde-plasma-networkmanagement.spec	19 Mar 2010 14:13:31 -0000	1.37
+++ kde-plasma-networkmanagement.spec	1 Apr 2010 15:25:29 -0000	1.38
@@ -3,12 +3,12 @@
 %define plasma_applet 1
 %define monolithic 1
 
-%define snap 20100310
+%define snap 20100401
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.17.%{snap}%{?dist}
+Release:        0.18.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -47,6 +47,10 @@ Requires: knetworkmanager-libs%{?_isa} =
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
 
+This Plasma applet is beta software with known issues and is available for 
+testing purposes only.  We recommend using knetworkmanager (the system tray
+version) for production use.
+
 %package -n knetworkmanager
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
@@ -78,6 +82,27 @@ Obsoletes:      knetworkmanager4-openvpn
 %description -n knetworkmanager-openvpn
 %{summary}.
 
+%package -n knetworkmanager-pptp
+Summary:        PPTP support for knetworkmanager
+Group:          Applications/Internet
+Requires:       knetworkmanager-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       NetworkManager-pptp
+Obsoletes:      kde-plasma-networkmanagement-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       kde-plasma-networkmanagement-pptp = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      knetworkmanager4-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n knetworkmanager-pptp
+%{summary}.
+
+%package -n knetworkmanager-strongswan
+Summary:        strongswan support for knetworkmanager
+Group:          Applications/Internet
+Requires:       knetworkmanager-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       strongswan 
+Obsoletes:      kde-plasma-networkmanagement-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       kde-plasma-networkmanagement-pptp = %{?epoch:%{epoch}:}%{version}-%{release}
+%description -n knetworkmanager-strongswan
+%{summary}.
+
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
 Group:          Applications/Internet
@@ -89,16 +114,6 @@ Obsoletes:      knetworkmanager4-vpnc < 
 %description -n knetworkmanager-vpnc
 %{summary}.
 
-%package -n knetworkmanager-pptp
-Summary:        PPTP support for knetworkmanager
-Group:          Applications/Internet
-Requires:       knetworkmanager-libs = %{?epoch:%{epoch}:}%{version}-%{release} 
-Requires:       NetworkManager-pptp
-Obsoletes:      kde-plasma-networkmanagement-pptp < %{?epoch:%{epoch}:}%{version}-%{release} 
-Provides:       kde-plasma-networkmanagement-pptp = %{?epoch:%{epoch}:}%{version}-%{release} 
-Obsoletes:      knetworkmanager4-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager-pptp
-%{summary}.
 
 %prep
 %setup -q -n networkmanagement-%{version}
@@ -128,12 +143,15 @@ make install/fast -C %{_target_platform}
 ## unpackaged files
 # nuke -devel type stuff for which there isn't a public API
 rm -fv %{buildroot}%{_kde4_libdir}/libknm{client,internals,service,ui}.so
-# novellvpn bits (TODO: what is it, useful?)
+# novellvpn bits (TODO: what is it?)
 rm -fv %{buildroot}%{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.desktop
+# strongswan bits
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/networkmanagement_strongswanui.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui.desktop
 
-%find_lang libknetworkmanager
-%find_lang knetworkmanager
+%find_lang knetworkmanager --with-kde
+%find_lang libknetworkmanager 
 %find_lang plasma_applet_networkmanagement
 
 
@@ -222,7 +240,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/networkmanagement_pptpui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
 
+
 %changelog
+* Thu Apr 01 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.18.20100401
+- 20100401 snapshot
+- (re)add warning about plasma applet stability
+
 * Fri Mar 19 2010 Jaroslav Reznik <jreznik at redhat.com> 1:0.9-0.17.20100310
 - split out PPTP VPN ui to -pptp
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	10 Mar 2010 16:17:11 -0000	1.19
+++ sources	1 Apr 2010 15:25:30 -0000	1.20
@@ -1 +1 @@
-6ae4d9bd5898872c79c9c1626062c456  networkmanagement-0.9-20100310.tar.bz2
+ee5487a70f2cf8b7aae8b311f61b0758  networkmanagement-0.9-20100401.tar.bz2