Author: glen                         Date: Wed Jan 17 14:25:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- KDE 3.5.6

---- Files affected:
SPECS:
   kdebase.spec (1.491.2.21 -> 1.491.2.22) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491.2.21 SPECS/kdebase.spec:1.491.2.22
--- SPECS/kdebase.spec:1.491.2.21       Sat Dec 23 13:05:51 2006
+++ SPECS/kdebase.spec  Wed Jan 17 15:25:32 2007
@@ -27,13 +27,13 @@
 Summary(uk):   K Desktop Environment - ÂÁÚĎ׌ ĆÁĘĚÉ
 Summary(zh_CN):        KDEşËĐÄ
 Name:          kdebase
-Version:       3.5.5
-Release:       5
+Version:       3.5.6
+Release:       0.2
 Epoch:         9
 License:       GPL
 Group:         X11/Applications
 Source0:       
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 0c685af1cbca75f9c77b3ed231ba0468
+# Source0-md5: a53f589f58012e655a52220a6a151019
 Source1:       %{name}-kdesktop.pam
 Source2:       %{name}-kdm.pam
 Source3:       %{name}-kdm-np.pam
@@ -47,10 +47,11 @@
 # Source10-md5:        f48ac7af286f4c87961de4bb24d07772
 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
+# http://www.icefox.net/articles/kdeosx/grouplayer.diff -- group all windows 
belonging to single app
+Patch2:                %{name}-grouplayer.patch
 Patch3:                %{name}-kdm_utmpx.patch
 Patch4:                %{name}-kdmconfig.patch
 Patch5:                %{name}-kicker.patch
@@ -67,17 +68,16 @@
 Patch20:       %{name}-seesar.patch
 Patch21:       %{name}-konsole-wordseps.patch
 Patch22:       %{name}-tango.patch
-Patch23:       kde-am.patch
 Patch24:       kde-ac260-lt.patch
 Patch25:       %{name}-konsole-history_clear.patch
 Patch26:       %{name}-kdm-default_background.patch
-Patch27:       kde-bug-124895.patch
 BuildRequires: OpenEXR-devel >= 1.2.2
 BuildRequires: OpenGL-devel
 BuildRequires: audiofile-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: samba-devel
+BuildRequires: samba-devel >= 1:3.0.23d-2.3
+BuildRequires: libsmbclient-devel >= 1:3.0.23d-2.3
 BuildRequires: bzip2-devel
 BuildRequires: cdparanoia-III-devel
 BuildRequires: cups-devel
@@ -1037,9 +1037,10 @@
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -1059,11 +1060,9 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p0
-%patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p0
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
@@ -2053,9 +2052,6 @@
 %{_iconsdir}/*/*/apps/linuxconf.png
 %{_iconsdir}/*/*/apps/lyx.png
 %{_iconsdir}/*/*/apps/mathematica.png
-%{_iconsdir}/*/*/apps/mozilla.png
-%{_iconsdir}/*/*/apps/mozilla_m.png
-%{_iconsdir}/*/*/apps/mozilla_mail.png
 %{_iconsdir}/*/*/apps/nedit.png
 %{_iconsdir}/*/*/apps/netscape.png
 %{_iconsdir}/*/*/apps/opera.png
@@ -2104,7 +2100,6 @@
 %{_iconsdir}/crystalsvg/*/apps/eclipse.png
 %{_iconsdir}/crystalsvg/*/apps/edu_*.png
 %{_iconsdir}/crystalsvg/*/apps/evolution.png
-%{_iconsdir}/crystalsvg/*/apps/firefox.png
 %{_iconsdir}/crystalsvg/*/apps/gabber.png
 %{_iconsdir}/crystalsvg/*/apps/gaim.png
 %{_iconsdir}/crystalsvg/*/apps/gnomemeeting.png
@@ -2115,7 +2110,6 @@
 %{_iconsdir}/crystalsvg/*/apps/planner.png
 %{_iconsdir}/crystalsvg/*/apps/scribus.png
 %{_iconsdir}/crystalsvg/*/apps/sodipodi.png
-%{_iconsdir}/crystalsvg/*/apps/thunderbird.png
 %{_iconsdir}/crystalsvg/*/apps/wine.png
 %{_iconsdir}/crystalsvg/scalable/apps
 # New
@@ -2155,6 +2149,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_find.so
 %{_libdir}/kde3/kickermenu_kdeprint.la
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_kdeprint.so
+%{_libdir}/kde3/kickermenu_kate.la
+%attr(755,root,root) %{_libdir}/kde3/kickermenu_kate.so
 %{_libdir}/kde3/kickermenu_konqueror.la
 %attr(755,root,root) %{_libdir}/kde3/kickermenu_konqueror.so
 %{_libdir}/kde3/kickermenu_konsole.la
@@ -2821,6 +2817,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.491.2.22  2007/01/17 14:25:32  glen
+- KDE 3.5.6
+
 Revision 1.491.2.21  2006/12/23 12:05:51  glen
 - BR: samba-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.491.2.21&r2=1.491.2.22&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to