SPECS: kdepim.spec - apply branch diff - buildconflict on (now obs...

[glen]

Author: glen                         Date: Tue Dec  6 20:45:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apply branch diff
- buildconflict on (now obsoleted) indexlib because autoreqdep would put a package name into req list
- rel 4

---- Files affected:
SPECS:
   kdepim.spec (1.203 -> 1.204) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.203 SPECS/kdepim.spec:1.204
--- SPECS/kdepim.spec:1.203	Wed Nov 30 11:12:14 2005
+++ SPECS/kdepim.spec	Tue Dec  6 21:45:48 2005
@@ -16,7 +16,7 @@
 Summary(uk):	đĹŇÓĎÎÁĚŘÎŮĘ ĐĚÁÎŐ×ÁĚŘÎÉË (PIM) ÄĚŃ KDE
 Name:		kdepim
 Version:	%{_ver}
-Release:	3
+Release:	4
 Epoch:		9
 License:	GPL
 Vendor:		The KDE Team
@@ -24,7 +24,7 @@
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
 # Source0-md5:	e19a2a40e422ecd483884ce6e9ac8925
 Icon:		kde-pim.xpm
-#Patch100:	%{name}-branch.diff
+Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kmail_toolbars.patch
 Patch2:		%{name}-alpha.patch
@@ -52,6 +52,7 @@
 BuildRequires:	zlib-devel
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
+BuildConflicts:	indexlib
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # subpackage akregator
 Obsoletes:	akregator
@@ -475,7 +476,7 @@
 
 %prep
 %setup -q
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1
@@ -1376,6 +1377,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204  2005/12/06 20:45:48  glen
+- apply branch diff
+- buildconflict on (now obsoleted) indexlib because autoreqdep would put a package name into req list
+- rel 4
+
 Revision 1.203  2005/11/30 10:12:14  adgor
 - Added Obsoletes for indexlib (removed BR)
 - indexlib-config moved to -devel
@@ -1397,7 +1403,7 @@
 - rel 2; new tarball
 
 Revision 1.198  2005/11/23 18:05:40  arekm
- rel 1
+- rel 1
 
 Revision 1.197  2005/11/21 17:41:20  glen
 - akregator.desktop installed
================================================================

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