rpms/kdepim/F-9 kdepim.spec, 1.165, 1.166 crystalsvg-conflicts.txt, 1.2, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv835/F-9

Modified Files:
	kdepim.spec 
Removed Files:
	crystalsvg-conflicts.txt 
Log Message:
* 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.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- kdepim.spec	11 Apr 2008 14:54:16 -0000	1.165
+++ kdepim.spec	4 Jun 2008 22:30:45 -0000	1.166
@@ -35,16 +35,15 @@
 # script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
 
-Release: 9.%{ent_date}svn.ent%{?dist}
+Release: 10.%{ent_date}svn.ent%{?dist}
 %else
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
 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
@@ -234,14 +233,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}
@@ -314,6 +305,9 @@
 
 
 %changelog
+* 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 ---