rpms/kdepim/devel crystalsvg-conflicts.txt, 1.1, 1.2 kdepim.spec, 1.145, 1.146

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	crystalsvg-conflicts.txt kdepim.spec 
Log Message:
* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-14.20071204.ent
- omit kpalmdoc.png icons too (f9+)



Index: crystalsvg-conflicts.txt
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/crystalsvg-conflicts.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crystalsvg-conflicts.txt	12 Dec 2007 20:29:21 -0000	1.1
+++ crystalsvg-conflicts.txt	8 Jan 2008 20:01:24 -0000	1.2
@@ -16,4 +16,5 @@
 kontact_summary_green.png
 kontact_summary.png
 kontact_todo.png
+kpalmdoc.png
 rss_tag.png


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdepim.spec	28 Dec 2007 21:59:33 -0000	1.145
+++ kdepim.spec	8 Jan 2008 20:01:24 -0000	1.146
@@ -35,9 +35,9 @@
 # script used to generate svn checkout Source0 above
 Source1: kdepim-enterprise-svn_checkout.sh
 
-Release: 13.svn%{ent_date}.ent%{?dist}
+Release: 14.svn%{ent_date}.ent%{?dist}
 %else
-Release: 13%{?dist}
+Release: 14%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
@@ -210,7 +210,7 @@
 
 %if 0%{?fedora} > 8
 # omit conflicts with kdeartwork-icons-crystalsvg
-# keep only: {kandy,kpalmdoc,kpilotDaemon}.png
+# keep only: {kandy,kpilotDaemon}.png
 for icon in `cat %{SOURCE20}` ; do 
   rm -f %{buildroot}%{_datadir}/icons/crystalsvg/*/*/${icon}
 done
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-14.20071204.ent
+- omit kpalmdoc.png icons too (f9+)
+
 * Fri Dec 28 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.8-13.20071204.ent
 - rebuild for new libopensync