rpms/kdepim/F-9 kdepim.spec, 1.171, 1.172 crystalsvg-conflicts.txt, 1.4, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23833/F-9

Modified Files:
	kdepim.spec 
Removed Files:
	crystalsvg-conflicts.txt 
Log Message:
Reapply temporarily reverted changes:

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- kdepim.spec	1 Sep 2008 12:37:17 -0000	1.171
+++ kdepim.spec	4 Sep 2008 09:14:38 -0000	1.172
@@ -28,7 +28,6 @@
 Source10: cr48-app-kandy.png
 Source11: cr32-app-kandy.png
 Source12: cr16-app-kandy.png
-Source20: crystalsvg-conflicts.txt
 
 Patch1: kdepim-3.4.0-kandy-icons.patch
 Patch2: kdepim-xdg_open.patch
@@ -200,14 +199,6 @@
  -e "s at -lgpgme@@g" \
  -e "s at -lgpg-error@@g"
 
-%if 0%{?fedora} > 8
-# omit conflicts with kdeartwork-icons-crystalsvg
-# keep only: {kandy,kpilotDaemon}.png
-for icon in `cat %{SOURCE20}` ; do 
-  rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
-done
-%endif
-
 
 %post
 %{!?libs:/sbin/ldconfig}
@@ -283,9 +274,12 @@
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 3.5.10-1
 - 3.5.10
 
-* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-9.1
+* Thu Jun 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 6:3.5.9-10.1
 - metakit patch to fix build on sparc64
 
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.9-10
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
 * Fri Apr 11 2008 Rex Dieter <rdieter at fedoraproject.org> 6:3.5.9-9
 - omit multilib upgrade hacks (see also #441222)
 


--- crystalsvg-conflicts.txt DELETED ---