SPECS (AC-branch): kdepim.spec - apply branch diff

[glen]

Author: glen                         Date: Sun Jan 28 22:39:54 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- apply branch diff

---- Files affected:
SPECS:
   kdepim.spec (1.222.2.17 -> 1.222.2.18) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.222.2.17 SPECS/kdepim.spec:1.222.2.18
--- SPECS/kdepim.spec:1.222.2.17	Mon Jan 22 03:12:33 2007
+++ SPECS/kdepim.spec	Sun Jan 28 23:39:49 2007
@@ -18,19 +18,17 @@
 Summary(uk):	đĹŇÓĎÎÁĚŘÎŮĘ ĐĚÁÎŐ×ÁĚŘÎÉË (PIM) ÄĚŃ KDE
 Name:		kdepim
 Version:	3.5.6
-Release:	0.2
+Release:	0.3
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	e37e6173fe9fd7f242c9502a4ae1d7de
-#Patch100:	%{name}-branch.diff
+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
-Patch5:		kdepim-bug-140207.patch
+Patch2:		%{name}-kmail-vcardviewer.patch
+Patch3:		kde-ac260-lt.patch
 BuildRequires:	autoconf
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -483,13 +481,11 @@
 
 %prep
 %setup -q
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p4
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
 	korganizer/korganizer.desktop
@@ -1331,6 +1327,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222.2.18  2007/01/28 22:39:49  glen
+- apply branch diff
+
 Revision 1.222.2.17  2007/01/22 02:12:33  glen
 - update
 
================================================================

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