rpms/kdebase-workspace/devel kdebase-workspace.spec,1.31,1.32

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-5
- Conflicts: kdelibs < 6:4 (temporary, to ease upgrade pain)
- -devel: Requires: %name-libs



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdebase-workspace.spec	4 Feb 2008 21:33:15 -0000	1.31
+++ kdebase-workspace.spec	6 Feb 2008 13:19:16 -0000	1.32
@@ -28,6 +28,9 @@
 
 # upgrade path: kdebase(3) -> kdebase-workspace
 Obsoletes: kdebase < 6:4
+# ease upgrade pain, help folks avoid shooting themselves in the foot 
+# hopefully only temporary
+Conflicts: kdelibs < 6:4
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -46,7 +49,7 @@
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): xdg-utils
@@ -84,7 +87,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -93,7 +96,8 @@
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+# out of paranoia really, may or may not be 100% essential.  -- Rex
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
@@ -219,6 +223,10 @@
 
 
 %changelog
+* Wed Feb 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-5
+- Conflicts: kdelibs < 6:4 (temporary, to ease upgrade pain)
+- -devel: Requires: %%name-libs
+
 * Mon Feb 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.1-4
 - backport enhancement to allow multi-line taskbar from 4.1 (kde#155974)