rpms/kdebase/FC-6 kdebase-3.5.6-1-redhat-startkde.patch, NONE, 1.1 kdebase.spec, 1.244, 1.245 sources, 1.75, 1.76 kdebase-3.3.1-pam_krb5-bz#191049.patch, 1.1, NONE kdebase-3.5.5-1-redhat-startkde.patch, 1.1, NONE kdebase-3.5.5-kde#134816.patch, 1.1, NONE kdebase-3.5.5-kde#135250.patch, 1.1, NONE kdebase-3.5.5-kde#137889.patch, 1.1, NONE kdebase-3.5.5-kde#88506.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 30 13:31:26 UTC 2007


Author: than

Update of /cvs/dist/rpms/kdebase/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19949

Modified Files:
	kdebase.spec sources 
Added Files:
	kdebase-3.5.6-1-redhat-startkde.patch 
Removed Files:
	kdebase-3.3.1-pam_krb5-bz#191049.patch 
	kdebase-3.5.5-1-redhat-startkde.patch 
	kdebase-3.5.5-kde#134816.patch kdebase-3.5.5-kde#135250.patch 
	kdebase-3.5.5-kde#137889.patch kdebase-3.5.5-kde#88506.patch 
Log Message:
3.5.6


kdebase-3.5.6-1-redhat-startkde.patch:
 startkde |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.5.6-1-redhat-startkde.patch ---
--- kdebase-3.5.5/startkde.redhat	2006-10-02 13:13:29.000000000 +0200
+++ kdebase-3.5.5/startkde	2006-10-10 17:35:53.000000000 +0200
@@ -1,7 +1,54 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.6 )
-#
+#  Modified for Red Hat Linux
+
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`LANG=C df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`LANG=C df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
 
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
@@ -14,12 +61,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -61,7 +108,7 @@
 cat >$kdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
+kpersonalizerrc General FirstLogin false
 ksplashrc KSplash Theme Default
 kcmrandrrc Display ApplyOnStartup false
 kcmrandrrc [Screen0]
@@ -157,8 +204,8 @@
 EOF
 fi
 
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# Source scripts found in <localprefix>/env/*.sh and /etc/kde/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -170,9 +217,10 @@
 # better use the Autostart folder.
 
 exepath=`kde-config --path exe | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do
+  for file in "$prefix"*.sh ; do
     test -r "$file" && . "$file"
   done
 done
@@ -378,7 +426,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/kdebase.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- kdebase.spec	30 Nov 2006 15:47:40 -0000	1.244
+++ kdebase.spec	30 Jan 2007 13:31:24 -0000	1.245
@@ -6,9 +6,9 @@
 %define redhatify 1
 %define include_kappfinder 0
 
-%define qt_version 3.3.6
-%define arts_version 1.5.5
-%define kde_version 3.5.5
+%define qt_version 3.3.7
+%define arts_version 1.5.6
+%define kde_version 3.5.6
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -17,8 +17,8 @@
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.5
-Release: 0.6%{?dist}
+Version: 3.5.6
+Release: 0.1%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -38,7 +38,7 @@
 Source11: cr48-app-package_games_kids.png
 
 Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-3.5.5-1-redhat-startkde.patch
+Patch1: kdebase-3.5.6-1-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -51,7 +51,6 @@
 Patch13: kdebase-3.5.5-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
-Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 Patch20: kdebase-3.5.5-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
@@ -61,12 +60,6 @@
 Patch25: kdebase-3.5.4-konqueror-shortcut.patch
 Patch26: kdebase-3.5.5-suspend.patch
 
-# upstream patches
-Patch500: kdebase-3.5.5-kde#134816.patch
-Patch501: kdebase-3.5.5-kde#135250.patch
-Patch502: kdebase-3.5.5-kde#88506.patch
-Patch503: kdebase-3.5.5-kde#137889.patch
-
 Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
 
 Requires(post): /sbin/ldconfig
@@ -132,6 +125,7 @@
 BuildRequires: libXtst-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
+BuildRequires: libutempter-devel
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 %endif
@@ -176,7 +170,6 @@
 %patch13 -p1 -b .dbus
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
-%patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
@@ -186,12 +179,6 @@
 %patch25 -p1 -b .konqueror-shortcut
 %patch26 -p1 -b .suspend
 
-# upstream patches
-%patch500 -p0 -b .kde#134816
-%patch501 -p1 -b .kde#135250
-%patch502 -p1 -b .kde#88506
-%patch503 -p1 -b .kde#137889
-
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -395,10 +382,6 @@
 # exclude fonts.dir
 rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir
 
-# rename to kde-games-kids as it's defined in applications.menu
-mv %{buildroot}%{_datadir}/desktop-directories/kde-games-kidsgames.directory \
-   %{buildroot}%{_datadir}/desktop-directories/kde-games-kids.directory
-
 %clean
 rm -rf %{buildroot}
 
@@ -569,6 +552,9 @@
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Tue Jan 30 2007 Than Ngo <than at redhat.com> - 6:3.5.6-0.1.fc6
+- 3.5.6
+
 * Thu Nov 30 2006 Than Ngo <than at redhat.com> - 6:3.5.5-0.6.fc6
 - apply upstream fix:
     #88506, dragged window follows mouse but on wrong screen (dual-head non-xinerama)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-6/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	26 Oct 2006 15:36:19 -0000	1.75
+++ sources	30 Jan 2007 13:31:24 -0000	1.76
@@ -1,2 +1,2 @@
 61b60ed4ea41b30dfc18579cac48d20c  kde-redhat-config-3.5-fc5-0.5.tar.bz2
-0c685af1cbca75f9c77b3ed231ba0468  kdebase-3.5.5.tar.bz2
+a53f589f58012e655a52220a6a151019  kdebase-3.5.6.tar.bz2


--- kdebase-3.3.1-pam_krb5-bz#191049.patch DELETED ---


--- kdebase-3.5.5-1-redhat-startkde.patch DELETED ---


--- kdebase-3.5.5-kde#134816.patch DELETED ---


--- kdebase-3.5.5-kde#135250.patch DELETED ---


--- kdebase-3.5.5-kde#137889.patch DELETED ---


--- kdebase-3.5.5-kde#88506.patch DELETED ---




More information about the fedora-cvs-commits mailing list