rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.18, 1.19

[Ben Boeckel]

Author: mathstuf

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

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Update snapshot


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- kde-plasma-networkmanagement.spec	16 Sep 2009 00:28:32 -0000	1.18
+++ kde-plasma-networkmanagement.spec	21 Sep 2009 06:33:57 -0000	1.19
@@ -6,21 +6,20 @@ 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.1.20090919svn%{?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 1025605 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
 
 BuildRequires:  kdelibs-experimental-devel
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
@@ -31,17 +30,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 +58,7 @@ 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:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -70,8 +68,7 @@ Provides:       kde-plasma-networkmanage
 
 %package -n knetworkmanager-vpnc
 Summary:        Vpnc support for knetworkmanager
-Group:          Applications/Internet 
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Group:          Applications/Internet
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
@@ -81,7 +78,7 @@ Provides:       kde-plasma-networkmanage
 
 
 %prep
-%setup -q -n kde-plasma-networkmanagement-0.1
+%setup -q
 
 
 %build
@@ -170,18 +167,25 @@ 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
+* 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 +250,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