rpms/kdepim/devel kdepim.spec, 1.216, 1.217 kdepim-4.2.2-korganizer-crash.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepim.spec 
Removed Files:
	kdepim-4.2.2-korganizer-crash.patch 
Log Message:
fixup patches



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- kdepim.spec	13 May 2009 18:10:46 -0000	1.216
+++ kdepim.spec	14 May 2009 19:00:10 -0000	1.217
@@ -13,8 +13,6 @@ Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# 4.2 upstream patches
-Patch100: kdepim-4.2.2-korganizer-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,8 +87,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 
-# upstream patches
-%patch100 -p0 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -106,9 +102,6 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# conflict with oxygen-icon-theme
-rm -rvf %{buildroot}%{_kde4_iconsdir}/oxygen/32x32/actions/appointment-new.png
-
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
 pushd %{buildroot}%{_docdir}/HTML/en


--- kdepim-4.2.2-korganizer-crash.patch DELETED ---