rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.46, 1.47

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2500

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
* 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)



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kde-plasma-networkmanagement.spec	14 Jun 2010 14:17:04 -0000	1.46
+++ kde-plasma-networkmanagement.spec	29 Jun 2010 18:36:02 -0000	1.47
@@ -8,7 +8,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.20.%{snap}%{?dist}
+Release:        0.21.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -51,6 +51,10 @@ Requires: knetworkmanager-libs%{?_isa} =
 # only want one of knetworkmanager-autostart or kde-plasma-networkmanagement installed
 #Conflicts: knetworkmanager-autostart
 
+%if "%{?_kde4_version}" < "4.4.76"
+Conflicts: kdebase-runtime > 4.4.76
+%endif
+
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
@@ -157,7 +161,7 @@ pushd %{_target_platform}
 %{cmake_kde4} \
   -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \
   %{?plasma_applet:-DNM_PLASMA_APPLET=BOOL:ON} \
-  %{?monolithic:-DNM_MONOLITHIC=BOOL:ON -DINSTALL_KNM_AUTOSTART=BOOL:ON} \
+  %{?monolithic:-DNM_MONOLITHIC=BOOL:ON -DINSTALL_KNM_AUTOSTART=ON} \
   ..
 popd
 
@@ -279,6 +283,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* 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)
+
 * Thu Jun 03 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.20.20100603
 - 20100603 snapshot
 - Add "Enable networking" button to knetworkmanager (rh#598765,kde#238325)