SPECS: kdelibs.spec, kdebase.spec, kdepim.spec - reenable branch d...

[arekm]

Author: arekm                        Date: Tue Oct 10 15:15:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reenable branch diff (it already contains fixes)

---- Files affected:
SPECS:
   kdelibs.spec (1.476 -> 1.477) , kdebase.spec (1.533 -> 1.534) , kdepim.spec (1.241 -> 1.242) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.476 SPECS/kdelibs.spec:1.477
--- SPECS/kdelibs.spec:1.476	Sat Oct  7 19:47:34 2006
+++ SPECS/kdelibs.spec	Tue Oct 10 17:15:43 2006
@@ -33,7 +33,7 @@
 Source2:	pnm.protocol
 Source3:	x-icq.mimelnk
 Source4:	x-mplayer2.desktop
-#Patch100:	%{name}-branch.diff
+Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kstandarddirs.patch
 Patch3:		%{name}-use_system_sgml.patch
@@ -337,7 +337,7 @@
 
 %prep
 %setup -q -a1
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -993,6 +993,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.477  2006/10/10 15:15:43  arekm
+- reenable branch diff (it already contains fixes)
+
 Revision 1.476  2006/10/07 17:47:34  arekm
 - new kdelibs/kdebase tarballs
 

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.533 SPECS/kdebase.spec:1.534
--- SPECS/kdebase.spec:1.533	Sat Oct  7 19:47:34 2006
+++ SPECS/kdebase.spec	Tue Oct 10 17:15:43 2006
@@ -46,7 +46,7 @@
 Source13:	ftp://ftp.pld-linux.org/software/kde/%{name}-konqsidebartng-PLD-entries-0.1.tar.bz2
 # Source13-md5:	c8b947bc3e8a2ac050d9e9548cf585fc
 # Temporary taken from kde svn
-#Patch100:	%{name}-branch.diff
+Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-fontdir.patch
 Patch3:		%{name}-kdm_utmpx.patch
@@ -1036,7 +1036,7 @@
 
 %prep
 %setup -q
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -2769,6 +2769,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.534  2006/10/10 15:15:43  arekm
+- reenable branch diff (it already contains fixes)
+
 Revision 1.533  2006/10/07 17:47:34  arekm
 - new kdelibs/kdebase tarballs
 

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.241 SPECS/kdepim.spec:1.242
--- SPECS/kdepim.spec:1.241	Thu Oct  5 12:48:34 2006
+++ SPECS/kdepim.spec	Tue Oct 10 17:15:43 2006
@@ -24,7 +24,7 @@
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	3f2127f74cb496899bb3f1f6f702353b
-#Patch100:	%{name}-branch.diff
+Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kmail_toolbars.patch
 Patch3:		%{name}-kmail-vcardviewer.patch
@@ -482,7 +482,7 @@
 
 %prep
 %setup -q
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -1346,6 +1346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.242  2006/10/10 15:15:43  arekm
+- reenable branch diff (it already contains fixes)
+
 Revision 1.241  2006/10/05 10:48:34  glen
 - remove junk introduced in r1.240
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.476&r2=1.477&f=u
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.533&r2=1.534&f=u
    http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.241&r2=1.242&f=u