rpms/kdebase/F-8 kdebase-3.5.10-konsolesu-kdesu.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 kdebase.spec, 1.297, 1.298 sources, 1.81, 1.82 kdebase-3.5-khotkeys-crash.patch, 1.2, NONE kdebase-3.5.7-kde#83974.patch, 1.1, NONE kdebase-3.5.7-konsolesu.patch, 1.1, NONE kdebase-3.5.8-glibc28-struct-ucred.patch, 1.1, NONE kdebase-3.5.8-konsole-bz#244906.patch, 1.1, NONE kdebase-3.5.9-lmsensors.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4896/F-8

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.10-konsolesu-kdesu.patch 
Removed Files:
	kdebase-3.5-khotkeys-crash.patch kdebase-3.5.7-kde#83974.patch 
	kdebase-3.5.7-konsolesu.patch 
	kdebase-3.5.8-glibc28-struct-ucred.patch 
	kdebase-3.5.8-konsole-bz#244906.patch 
	kdebase-3.5.9-lmsensors.patch 
Log Message:
Sync from kdebase3/devel:

* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
- kde-3.5.10

* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
- rebuild for new libraw1394

* Wed Jun 11 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-16
- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)

* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)

kdebase-3.5.10-konsolesu-kdesu.patch:

--- NEW FILE kdebase-3.5.10-konsolesu-kdesu.patch ---
diff -up kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu kdebase-3.5.10/konsole/konsolesu.desktop
--- kdebase-3.5.10/konsole/konsolesu.desktop.konsolesu-kdesu	2008-08-19 13:17:13.000000000 -0500
+++ kdebase-3.5.10/konsole/konsolesu.desktop	2008-08-28 17:15:14.000000000 -0500
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=konsole --type su
+Exec=kdesu konsole
 Icon=konsole
 DocPath=konsole/index.html
 MimeType=application/x-konsole;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	16 Apr 2008 13:44:12 -0000	1.61
+++ .cvsignore	4 Sep 2008 08:01:47 -0000	1.62
@@ -1,4 +1,4 @@
-kdebase-3.5.9.tar.bz2
 cr16-app-package_games_kids.png
 cr32-app-package_games_kids.png
 cr48-app-package_games_kids.png
+kdebase-3.5.10.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- kdebase.spec	23 May 2008 13:23:42 -0000	1.297
+++ kdebase.spec	4 Sep 2008 08:01:47 -0000	1.298
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
 %define debug 0 
 %define final 1 
 %define redhatify 1
@@ -11,8 +13,8 @@
 
 %define _with_samba --with-samba
 
-Version: 3.5.9
-Release: 14%{?dist}.1
+Version: 3.5.10
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -77,24 +79,15 @@
 Patch26: kdebase-3.5.5-suspend.patch
 Patch27: kdebase-3.5.8-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
-# FIXME? (still needed?) -- Rex
-Patch29: kdebase-3.5.8-konsole-bz#244906.patch
 Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
-Patch31: kdebase-3.5.7-konsolesu.patch
-# fix check for struct ucred to work with current glibc 2.7.90
-Patch35: kdebase-3.5.8-glibc28-struct-ucred.patch
+# kdebase: "Root Shell" sessions will not close, http://bugzilla.redhat.com/301841
+Patch31: kdebase-3.5.10-konsolesu-kdesu.patch
 # modified version of kubuntu_9915_userdiskmount.diff
 # fixes NTFS (#378041) and adds PolicyKit support (#428212)
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb
 Patch37: kdebase-3.5.9-libkrdb_dep.patch
 
-# upstream patches
-# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch200: kdebase-3.5.7-kde#83974.patch
-Patch201: kdebase-3.5.9-lmsensors.patch
-Patch202: kdebase-3.5-khotkeys-crash.patch
-
 # security fixes
 
 %if 0%{?libs}
@@ -317,21 +310,12 @@
 %{?_with_suspend:%patch26 -p1 -b .suspend}
 %{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
-#patch29 -p1 -b .konsole-bz#244906
 %patch30 -p1 -b .bz#265801
 %patch31 -p1 -b .konsolesu-kdesu
-%patch35 -p1 -b .ucred
 %if 0%{?fedora} > 7
 %patch36 -p1 -b .userdiskmount
 %endif
-%if "%{name}" != "kdebase"
 %patch37 -p1 -b .libkrdb_dep
-%endif
-
-## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-#patch200 -p4 -b .kde#83974
-%patch201 -p0 -b .sensor
-%patch202 -p0 -b .khotkeys-crash
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -469,7 +453,6 @@
    for f in $(find %{buildroot}%{_datadir}/applnk -name "*.desktop") ; do
       echo "OnlyShowIn=KDE;" >> $f
    done
-
 %endif
 
 # Own Mozilla plugin dir
@@ -543,6 +526,14 @@
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
 
+#Â remove mediamanager stuff #447852 and kdebug:163717
+rm -f %{buildroot}%{_libdir}/kde3/kded_mediamanager.*
+rm -f %{buildroot}%{_libdir}/kde3/kded_medianotifier.*
+rm -f %{buildroot}%{_libdir}/kde3/kcm_media.*
+rm -f %{buildroot}%{_datadir}/services/kded/mediamanager.desktop
+rm -f %{buildroot}%{_datadir}/services/kded/medianotifier.desktop
+rm -f %{buildroot}%{_datadir}/applications/kde/media.desktop
+
 # remove conflicts with kdesdk
 rm -f %{buildroot}%{_datadir}/config/katerc
 
@@ -565,8 +556,6 @@
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," *.desktop
 popd
 
-# remove all crsystalsvg icons for now
-rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
 # hicolor
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/kappfinder.*
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/khelpcenter.*
@@ -762,7 +751,6 @@
 %{_datadir}/desktop-directories/*
 %{_datadir}/locale/*/entry.desktop
 %{_datadir}/locale/l10n
-%{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
@@ -798,6 +786,7 @@
 %ghost %{_localstatedir}/lib/kdm/kdmsts
 %endif
 %{_datadir}/config.kcfg/*
+%{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kio_system_documenthelper
 %{_bindir}/kdcop
@@ -810,6 +799,7 @@
 %{_datadir}/applications/*/*
 %{_datadir}/apps/*
 %{_datadir}/icons/*color/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
@@ -867,6 +857,18 @@
 
 
 %changelog
+* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
+- kde-3.5.10
+
+* Wed Jul 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-17
+- rebuild for new libraw1394
+
+* Wed Jun 11 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-16
+- remove kded_media* to prevent clashes with Solid from KDE 4 (#447852, kdebug:163717)
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-15
+- reinclude crystalsvg icons also on f9+ (no longer using crystalsvg from KDE 4)
+
 * Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-14.1
 - don't set XDG_CONFIG_DIRS (#249109)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	16 Feb 2008 02:46:32 -0000	1.81
+++ sources	4 Sep 2008 08:01:47 -0000	1.82
@@ -1,4 +1,4 @@
 0b4d2328a153d9987562cbf875c5a228  cr16-app-package_games_kids.png
 a2fb4b0bc9b7816bf29b7f2fe52b04c0  cr32-app-package_games_kids.png
 259dd812748a2964f01ca3c3493b72c6  cr48-app-package_games_kids.png
-c8c35389a238aa1b73e68ef5298eadf8  kdebase-3.5.9.tar.bz2
+88237188271fbf1e6bcd40180a75d953  kdebase-3.5.10.tar.bz2


--- kdebase-3.5-khotkeys-crash.patch DELETED ---


--- kdebase-3.5.7-kde#83974.patch DELETED ---


--- kdebase-3.5.7-konsolesu.patch DELETED ---


--- kdebase-3.5.8-glibc28-struct-ucred.patch DELETED ---


--- kdebase-3.5.8-konsole-bz#244906.patch DELETED ---


--- kdebase-3.5.9-lmsensors.patch DELETED ---