rpms/kdebase/devel kdebase.spec,1.263.2.15,1.263.2.16

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
cosmetics
remove dup'd BR: dbus-devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.15
retrieving revision 1.263.2.16
diff -u -r1.263.2.15 -r1.263.2.16
--- kdebase.spec	30 Jul 2007 21:37:55 -0000	1.263.2.15
+++ kdebase.spec	31 Jul 2007 00:14:28 -0000	1.263.2.16
@@ -10,6 +10,9 @@
 Obsoletes:     kdebase4 < %{version}-%{release}
 Provides:      kdebase4 = %{version}-%{release}
 
+# /usr/bin/plasma (#250180)
+Conflicts:  rss-glx < 0.8.1.p-8
+
 %else
 Name:          kdebase4
 %define        _prefix /opt/kde4
@@ -21,11 +24,6 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# /usr/bin/plasma (#250180)
-%if "%{_prefix}" == "/usr"
-Conflicts:  rss-glx < 0.8.1.p-8
-%endif
-
 # FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX  
 # don't rely on env (same goes for kde3) -- Rex
 Source1: kde4-opt.sh
@@ -67,7 +65,7 @@
 BuildRequires: freetype-devel
 BuildRequires: gettext
 BuildRequires: glib2-devel
-BuildRequires: hal-devel dbus-devel
+BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libart_lgpl-devel