rpms/kdebase-workspace/devel kdebase-workspace.spec,1.83,1.84

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31834/devel

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Tue Jun 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-3
- enable NetworkManager support, now compatible with NM 0.7


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdebase-workspace.spec	29 May 2008 18:16:38 -0000	1.83
+++ kdebase-workspace.spec	3 Jun 2008 17:07:54 -0000	1.84
@@ -1,12 +1,8 @@
-
-# FIXME, currently incompat with nm >= 0.7
-%define _without_nm -DWITH_NetworkManager=off
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.0.80
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -65,7 +61,7 @@
 BuildRequires: libxklavier-devel
 BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
-%{!?_without_nm:BuildRequires: NetworkManager-devel}
+BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 
@@ -162,7 +158,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} %{?_without_nm} \
+%{cmake_kde4} \
   -DKDE4_KDM_PAM_SERVICE=kdm \
   -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
   -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver ..
@@ -278,6 +274,9 @@
 
 
 %changelog
+* Tue Jun 03 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-3
+- enable NetworkManager support, now compatible with NM 0.7
+
 * Thu May 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.80-2
 - BR: libcaptury-devel