SPECS: kdepim.spec - drop kpilot patch; merged upstream

[arekm]

Author: arekm                        Date: Sat Jan 27 21:24:52 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop kpilot patch; merged upstream

---- Files affected:
SPECS:
   kdepim.spec (1.254 -> 1.255) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.254 SPECS/kdepim.spec:1.255
--- SPECS/kdepim.spec:1.254	Sat Jan 27 19:02:52 2007
+++ SPECS/kdepim.spec	Sat Jan 27 22:24:47 2007
@@ -27,9 +27,8 @@
 Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kmail_toolbars.patch
-Patch2:		%{name}-kpilot.patch
-Patch3:		%{name}-kmail-vcardviewer.patch
-Patch4:		kde-ac260-lt.patch
+Patch2:		%{name}-kmail-vcardviewer.patch
+Patch3:		kde-ac260-lt.patch
 BuildRequires:	autoconf
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -487,7 +486,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
 	korganizer/korganizer.desktop
@@ -1163,6 +1161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.255  2007/01/27 21:24:47  arekm
+- drop kpilot patch; merged upstream
+
 Revision 1.254  2007/01/27 18:02:52  arekm
 - ctrl+j crash fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.254&r2=1.255&f=u