rpms/kde-plasma-networkmanagement/F-11 kde-plasma-networkmanagement-0.9-desktop.patch, NONE, 1.1 kde-plasma-networkmanagement.spec, 1.9, 1.10 sources, 1.8, 1.9

[Ben Boeckel]

Author: mathstuf

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

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Added Files:
	kde-plasma-networkmanagement-0.9-desktop.patch 
Log Message:
New snapshot

kde-plasma-networkmanagement-0.9-desktop.patch:
 kded/networkmanagement.desktop           |    2 +-
 monolithic/knetworkmanager.desktop       |    2 +-
 settings/service/knetworkmanager.desktop |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop	2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop	2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 X-DCOP-ServiceType=Unique
 X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
 Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop	2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop	2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
 X-KDE-ModuleType=Library
 X-KDE-Library=knetworkmanager
 X-KDE-DBus-ModuleName=knetworkmanager
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- kde-plasma-networkmanagement.spec	16 Sep 2009 00:32:54 -0000	1.9
+++ kde-plasma-networkmanagement.spec	30 Sep 2009 15:49:05 -0000	1.10
@@ -6,21 +6,22 @@ We still recommend nm-applet from Networ
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
-Version:        0.8
-Release:        0.22.20090815svn%{?dist}
+Version:        0.9
+Release:        0.3.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
-Group:          Applications/Internet 
+Group:          Applications/Internet
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
 URL:            http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1011744 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
-#  tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
-#Source0:        %{name}-%{version}.tar.bz2
-Source0: kde-plasma-networkmanagement-0.1.tar.bz2
+#  svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
+# Patch to get .desktop files validated
+Patch0:         %{name}-%{version}-desktop.patch
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -31,17 +32,17 @@ Requires: NetworkManager
 
 # multilib upgrades
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
-Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service. 
+the default NetworkManager service.
 %{?disclaimer}
 
 %package -n knetworkmanager
-Summary: NetworkManager KDE 4 integration 
+Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
 Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager
@@ -59,8 +60,8 @@ Requires: knetworkmanager = %{?epoch:%{e
 
 %package -n knetworkmanager-openvpn
 Summary:        OpenVPN support for knetworkmanager
-Group:          Applications/Internet 
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release} 
+Group:          Applications/Internet
+Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -70,7 +71,7 @@ Provides:       kde-plasma-networkmanage
 
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
-Group:          Applications/Internet 
+Group:          Applications/Internet
 Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
@@ -81,7 +82,8 @@ Provides:       kde-plasma-networkmanage
 
 
 %prep
-%setup -q -n kde-plasma-networkmanagement-0.1
+%setup -q
+%patch0 -p1 -b .desktop
 
 
 %build
@@ -170,18 +172,31 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %files -n kde-plasma-networkmanagement
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
 %{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
 
 
 %changelog
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
+- Add back missing Requires:
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
+- Version seems to be .9 now
+- Fix trailing spaces
+- New snapshot
+
 * Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
 - Epoch: 1
 
 * Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
 - use knetworkmanager pkg names
-- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path 
+- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
   for knetworkmanager-0.7 (from F-10)
 - nuke -devel pkg
 - drop references to short-lived kde-plasma-networkmanager
@@ -246,7 +261,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 * Sat Feb 7 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.3.20090207svn
 - Add changelog
-- Added tarball creation 
+- Added tarball creation
 - Changed name to kde-plasma-networkmanagement
 
 * Tue Jan 13 2009 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1-0.2.20090111svn


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Aug 2009 18:38:05 -0000	1.8
+++ sources	30 Sep 2009 15:49:05 -0000	1.9
@@ -1 +1 @@
-8a072d778cda60990c4670d85cad2f0c  kde-plasma-networkmanagement-0.1.tar.bz2
+445ca659ff85fb90741ba3642e683728  kde-plasma-networkmanagement-0.9.tar.bz2