[kde-plasma-networkmanagement] - 20100830 snapshot - Requires: kdebase-runtime

[Rex Dieter]

commit 1d62889b621f51e56fe117b75f2630730de50c90
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 2 08:14:44 2010 -0500

    - 20100830 snapshot
    - Requires: kdebase-runtime

 .gitignore                               |    1 +
 kde-plasma-networkmanagement.spec        |   10 +++++++---
 networkmanagement-0.9-disable_kded.patch |    7 ++++---
 sources                                  |    2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac61efd..35e8428 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 networkmanagement-0.9-20100603.tar.bz2
+/networkmanagement-0.9-20100830.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index c0a1a54..02812fb 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -3,12 +3,12 @@
 %define plasma_applet 1
 %define monolithic 1
 
-%define snap 20100603
+%define snap 20100830
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.21.%{snap}%{?dist}
+Release:        0.22.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -51,6 +51,7 @@ Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
 # only want one of knetworkmanager-autostart or kde-plasma-networkmanagement installed
 #Conflicts: knetworkmanager-autostart
 
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 %if "%{?_kde4_version}" < "4.4.76"
 Conflicts: kdebase-runtime > 4.4.76
 %endif
@@ -95,7 +96,6 @@ Conflicts: kde-plasma-networkmanagement
 %package -n knetworkmanager-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 %description -n knetworkmanager-libs
@@ -283,6 +283,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Mon Aug 30 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.22.20100830
+- 20100830 snapshot
+- Requires: kdebase-runtime
+
 * Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.21.20100603
 - Conflicts: kdebase-runtime > 4.4.76 (if built on/for < kde-4.4)
 - use -DINSTALL_KNM_AUTOSTART=ON (compat with f12's cmake)
diff --git a/networkmanagement-0.9-disable_kded.patch b/networkmanagement-0.9-disable_kded.patch
index a0b8cf8..e1c44c2 100644
--- a/networkmanagement-0.9-disable_kded.patch
+++ b/networkmanagement-0.9-disable_kded.patch
@@ -1,11 +1,12 @@
 diff -up networkmanagement-0.9/kded/networkmanagement.desktop.disable_kded networkmanagement-0.9/kded/networkmanagement.desktop
---- networkmanagement-0.9/kded/networkmanagement.desktop.disable_kded	2010-06-03 10:56:20.000000000 -0500
-+++ networkmanagement-0.9/kded/networkmanagement.desktop	2010-06-08 13:56:39.092896564 -0500
-@@ -36,6 +36,6 @@ X-KDE-ServiceTypes=KDEDModule
+--- networkmanagement-0.9/kded/networkmanagement.desktop.disable_kded	2010-08-30 17:43:21.000000000 -0500
++++ networkmanagement-0.9/kded/networkmanagement.desktop	2010-08-30 18:10:00.532042782 -0500
+@@ -33,7 +33,7 @@ X-KDE-ServiceTypes=KDEDModule
  X-KDE-ModuleType=Library
  X-KDE-Library=networkmanagement
  X-KDE-DBus-ModuleName=networkmanagement
 -X-KDE-Kded-autoload=true
 +X-KDE-Kded-autoload=false
  X-KDE-Kded-load-on-demand=true
+ X-KDE-Kded-phase=1
  OnlyShowIn=KDE;
diff --git a/sources b/sources
index 9a36b51..e036030 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f8ec1c26de7689adbc7eb0c5e0cf252  networkmanagement-0.9-20100603.tar.bz2
+1b21f475973230b0ef2f9dbd95f74bd3  networkmanagement-0.9-20100830.tar.bz2