rpms/kdebase/devel kdebase.spec,1.263.2.13,1.263.2.14

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Log Message:
rss-glx conflict only needed if "%{_prefix}" == "/usr"


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.13
retrieving revision 1.263.2.14
diff -u -r1.263.2.13 -r1.263.2.14
--- kdebase.spec	30 Jul 2007 21:26:03 -0000	1.263.2.13
+++ kdebase.spec	30 Jul 2007 21:31:28 -0000	1.263.2.14
@@ -22,7 +22,9 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # /usr/bin/plasma
+%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
@@ -256,6 +258,7 @@
 %changelog
 * Mon Jul 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.92.0-3
 - bump rss-glx Conflicts because the conflict is still there in 0.8.1.p-7.fc8
+- rss-glx conflict only needed if "%%{_prefix}" == "/usr"
 - consolekit_kdm patch only needs BR dbus-devel, not ConsoleKit-devel
 
 * Mon Jul 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2