rpms/kdepim/devel kdepim.spec,1.177,1.178

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdepim.spec 
Log Message:
* Sun Jul 13 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
- fix conflict with oxygen-icon-theme



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kdepim.spec	11 Jul 2008 04:04:22 -0000	1.177
+++ kdepim.spec	13 Jul 2008 16:19:32 -0000	1.178
@@ -7,7 +7,7 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.0.98
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -105,6 +105,9 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# conflict with oxygen-icon-theme
+rm -rf %{buildroot}%{_kde4_icondir}/oxygen/32x32/actions/appointment-new.png
+
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
 pushd %{buildroot}%{_docdir}/HTML/en
@@ -173,6 +176,9 @@
 
 
 %changelog
+* Sun Jul 13 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
+- fix conflict with oxygen-icon-theme
+
 * Thu Jul 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1
 - 4.0.98