rpms/kde-plasma-networkmanagement/devel .cvsignore, 1.4, 1.5 kde-plasma-networkmanagement.spec, 1.37, 1.38 sources, 1.17, 1.18

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9556

Modified Files:
	.cvsignore kde-plasma-networkmanagement.spec sources 
Log Message:
* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.14.20100309svn
- 200100309 snapshot
- on queue, plasmoid reportedly ready for wider testing, re-enabling (#571433)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Feb 2010 01:08:55 -0000	1.4
+++ .cvsignore	9 Mar 2010 20:06:20 -0000	1.5
@@ -1 +1 @@
-networkmanagement-0.9.tar.bz2
+networkmanagement-0.9-20100309.tar.bz2


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- kde-plasma-networkmanagement.spec	8 Mar 2010 15:36:58 -0000	1.37
+++ kde-plasma-networkmanagement.spec	9 Mar 2010 20:06:21 -0000	1.38
@@ -1,11 +1,13 @@
 
 # define/set to include plasma applet
-#define plasma_applet 1
+%define plasma_applet 1
+
+%define snap 20100309
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.13.20100220%{?dist}
+Release:        0.14.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -20,7 +22,7 @@ Patch50: networkmanagement-0.9-no_applet
 # using the create_tarball.rb script from kdesdk trunk:
 # ./create_tarball.rb -n -a networkmanagement
 # Please always use create_tarball.rb so translations get included.
-Source0:        networkmanagement-%{version}.tar.bz2
+Source0:        networkmanagement-%{version}-%{snap}.tar.bz2
 
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
@@ -37,6 +39,7 @@ Obsoletes: kde-plasma-networkmanagement-
 
 # FIXME: Drop this? It makes trying out the plasmoid painful as the monolithic
 #        version autostarts. -- Kevin
+# Need to first split out common files used by both knm and plasmoid -- Rex
 Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?plasma_applet}
@@ -158,6 +161,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %postun -n knetworkmanager-libs -p /sbin/ldconfig
 
 
+%files -f plasma_applet_networkmanagement.lang
+%defattr(-,root,root,-)
+%if 0%{?plasma_applet}
+%{_kde4_appsdir}/desktoptheme/default/widgets/wireless.svgz
+%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+%endif
+
 %files -n knetworkmanager -f knetworkmanager.lang
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
@@ -202,17 +215,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
 
-%files -n kde-plasma-networkmanagement -f plasma_applet_networkmanagement.lang
-%defattr(-,root,root,-)
-%if 0%{?plasma_applet}
-%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
-%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
-%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
-%{_kde4_libdir}/kde4/kded_networkmanagement.so
-%endif
-
 
 %changelog
+* Tue Mar 09 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.14.20100309svn
+- 200100309 snapshot
+- on queue, plasmoid reportedly ready for wider testing, re-enabling (#571433)
+
 * Mon Mar 08 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.13.20100220svn
 - make kde-plasma-neworkmanagment an empty placeholder package (#571433)
 - knetworkmanager: move kcm_networkmanagement_tray bits here (from kde-plasma-nm)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Feb 2010 01:08:55 -0000	1.17
+++ sources	9 Mar 2010 20:06:21 -0000	1.18
@@ -1 +1 @@
-9c07ea47ff858b04b72daf6193f0ecdd  networkmanagement-0.9.tar.bz2
+11725d72b0e3e350c711e21c43e3d42a  networkmanagement-0.9-20100309.tar.bz2