rpms/kdepim/devel kdepim.spec,1.219,1.220

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24264

Modified Files:
	kdepim.spec 
Log Message:
* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
- fix meeting-organizer icon conflict with oxygen-icons
- -libs: (re)add dep on kdelibs4



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- kdepim.spec	19 May 2009 13:42:06 -0000	1.219
+++ kdepim.spec	29 May 2009 15:57:17 -0000	1.220
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -77,7 +77,7 @@ Install %{name}-devel if you want to wri
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-#Requires: kdelibs4 >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description libs
@@ -88,6 +88,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
+# omit conflict with oxygen-icons, working on a better long-term fix with 
+# oxygen folk to get all the icons/temporary stuff out of kdepim
+rm -fv icons/temporary/ox16-status-meeting-organizer.png
+
 
 %build
 mkdir -p %{_target_platform}
@@ -180,6 +184,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-2
+- fix meeting-organizer icon conflict with oxygen-icons
+- -libs: (re)add dep on kdelibs4
+
 * Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
 - KDE 4.3 beta 1