rpms/kdebase-workspace/F-12 kdebase-workspace.spec,1.305,1.306

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1605

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
- fix logic on Requires: kdm  (ie, make F-12 builds not include it)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -p -r1.305 -r1.306
--- kdebase-workspace.spec	12 Nov 2009 19:53:26 -0000	1.305
+++ kdebase-workspace.spec	12 Nov 2009 20:55:29 -0000	1.306
@@ -9,7 +9,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.3
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -105,7 +105,7 @@ Requires: %{name}-libs%{?_isa} = %{versi
 Requires: kdebase-runtime >= %{version}
 
 # pkg-splits, upgrade path
-%if 0%{?fedora} < 12 || 0%{?rhel} < 6
+%if 0%{?fedora} < 12 && 0%{?rhel} < 6
 Requires: kdm = %{version}-%{release}
 %endif
 Requires: ksysguardd = %{version}-%{release}
@@ -610,6 +610,9 @@ fi
 
 
 %changelog
+* Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
+- fix logic on Requires: kdm  (ie, make F-12 builds not include it)
+
 * Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
 - try experimental patch for "keyboard stops working" (kde#171685)