rpms/kdebase/devel kdebase-3.5.7-1-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.56, 1.57 kdebase.spec, 1.254, 1.255 sources, 1.77, 1.78 kdebase-3.4.2-npapi-64bit-fixes.patch, 1.1, NONE kdebase-3.5.4-antialias.patch, 1.1, NONE kdebase-3.5.6-1-redhat-startkde.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22542

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.7-1-redhat-startkde.patch 
Removed Files:
	kdebase-3.4.2-npapi-64bit-fixes.patch 
	kdebase-3.5.4-antialias.patch 
	kdebase-3.5.6-1-redhat-startkde.patch 
Log Message:
* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
- specfile portability

* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- fix BR: kdelibs-devel
- cleanup Req's wrt kde-settings

* Mon Jun 11 2007 Than Ngo <than at redhat.com> -  6:3.5.7-1.fc7.1
- remove kdebase-3.4.2-npapi-64bit-fixes.patch, it's included
  in new upstream

* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1
- 3.5.7


kdebase-3.5.7-1-redhat-startkde.patch:

--- NEW FILE kdebase-3.5.7-1-redhat-startkde.patch ---
--- kdebase-3.5.7/startkde.redhat	2006-10-02 13:13:29.000000000 +0200
+++ kdebase-3.5.7/startkde	2006-10-10 17:35:53.000000000 +0200
@@ -1,7 +1,54 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.7 )
-#
+#  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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	15 May 2007 14:15:40 -0000	1.56
+++ .cvsignore	16 Jun 2007 19:11:13 -0000	1.57
@@ -30,3 +30,4 @@
 kdebase-3.5.6.tar.bz2
 kde-redhat-config-3.5-fc5-0.6.tar.bz2
 kde-redhat-config-3.5-fc7-1.tar.bz2
+kdebase-3.5.7.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- kdebase.spec	17 May 2007 19:00:37 -0000	1.254
+++ kdebase.spec	16 Jun 2007 19:11:13 -0000	1.255
@@ -1,4 +1,3 @@
-%define rhel 0
 
 %define debug 0 
 %define final 0
@@ -7,8 +6,8 @@
 %define kde_settings 1
 
 %define qt_version 3.3.8
-%define arts_version 1.5.6
-%define kde_version 3.5.6
+%define arts_version 1.5.7
+%define kde_version 3.5.7
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
@@ -18,8 +17,8 @@
 Summary: K Desktop Environment - core files
 Name:    kdebase
 Epoch:   6
-Version: 3.5.6
-Release: 12%{?dist}
+Version: 3.5.7
+Release: 3%{?dist}
 
 License: GPL
 Url: http://www.kde.org
@@ -41,7 +40,7 @@
 Source12: kderc
 
 Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-3.5.6-1-redhat-startkde.patch
+Patch1: kdebase-3.5.7-1-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
 Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
@@ -58,26 +57,17 @@
 Patch20: kdebase-3.5.5-keyinit.patch
 Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 Patch22: kdebase-3.5.4-htdig.patch
-Patch23: kdebase-3.5.4-antialias.patch
 Patch24: kdebase-3.5.4-tango-icon-theme.patch
 Patch25: kdebase-3.5.4-konqueror-shortcut.patch
 Patch26: kdebase-3.5.5-suspend.patch
 Patch27: kdebase-3.5.6-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
 
-# See     http://gwenole.beauchesne.info/en/projects/nspluginwrapper/help
-Patch200: http://gwenole.beauchesne.info/projects/nspluginwrapper/files/kdebase-3.4.2-npapi-64bit-fixes.patch
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): fileutils sh-utils
 Requires(postun): fileutils sh-utils
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-#Requires: /etc/X11/xdm/Xaccess
-#Requires: /etc/X11/xdm/Xservers
-#Requires: /etc/X11/xdm/Xwilling
-#Requires: /etc/X11/xinit/Xsession
-#Requires: /etc/X11/xdm/Xsetup_0
 # See http://bugzilla.redhat.com/191306
 Requires(hint): htdig
 # man2html
@@ -102,26 +92,20 @@
 Requires: kde-settings-kdm
 %else
 Requires: xorg-x11-xdm
-%endif
-
-%if %{redhatify}
 Requires: desktop-backgrounds-basic
 Requires: redhat-menus => 6.7.5
 Requires: redhat-artwork-kde >= 7.0.0-8
 %endif
 
-BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: libxslt-devel libxml2-devel
 %if 0%{?fedora} > 6
 BuildRequires: libsmbclient-devel
 %else
 BuildRequires: samba 
 %endif
-# leave this out for now -- Rex
-#Requires(hint): samba-common
 BuildRequires: pam-devel
 BuildRequires: gettext
-BuildRequires: imake
 BuildRequires: perl
 BuildRequires: sed
 %if %{make_cvs}
@@ -129,14 +113,24 @@
 %endif
 BuildRequires: pkgconfig
 BuildRequires: doxygen
-BuildRequires: dbus-devel >= 0.90
-BuildRequires: hal-devel >= 0.5
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%ifarch %{ix86} x86_64 ia64 ppc ppc64
+%define _with_suspend 1
+Requires: pm-utils
+%endif
+%define _with_hal --with-hal
+# dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
+BuildRequires: dbus-devel hal-devel
+%endif
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: libart_lgpl-devel
-BuildRequires: xorg-x11-proto-devel
+## X11 support details (xmkmf, bdftopcf)
 BuildRequires: xorg-x11-font-utils
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: imake
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libfontenc-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: libXdamage-devel
@@ -145,11 +139,17 @@
 BuildRequires: libXrandr-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXfixes-devel
-BuildRequires: libXext-devel 
+BuildRequires: libXext-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
+%endif
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+# See also http://bugzilla.redhat.com/205767
 BuildRequires: libutempter-devel
+%else
+BuildRequires: utempter
+%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
@@ -159,6 +159,7 @@
 %endif
 BuildRequires: OpenEXR-devel
 
+
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
 (replacement for xdm), kwin (window manager), konqueror (filemanager,
@@ -210,14 +211,13 @@
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 %patch22 -p1 -b .htdig
-%patch23 -p1 -b .antialias
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
-%patch26 -p1 -b .suspend
+%{?_with_suspend:%patch26 -p1 -b .suspend}
 %patch27 -p1 -b .consolekit
 %patch28 -p1 -b .kdm-alternatebackground
 
-%if %{rhel}
+%if 0%{?rhel:1}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
 %endif
@@ -296,7 +296,7 @@
 install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
 install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
 
-%if %{rhel}
+%if 0%{?rhel:1}
 rm -rf %{buildroot}%{_bindir}/kappfinder \
        %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
        %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
@@ -633,6 +633,20 @@
 
 
 %changelog
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
+- specfile portability
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- fix BR: kdelibs-devel
+- cleanup Req's wrt kde-settings
+
+* Mon Jun 11 2007 Than Ngo <than at redhat.com> -  6:3.5.7-1.fc7.1
+- remove kdebase-3.4.2-npapi-64bit-fixes.patch, it's included
+  in new upstream
+
+* Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1
+- 3.5.7
+
 * Thu May 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-12
 - -extras: fix Requires: %%name ... (omitting %%_arch)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	15 May 2007 14:15:40 -0000	1.77
+++ sources	16 Jun 2007 19:11:13 -0000	1.78
@@ -1,2 +1,2 @@
-a53f589f58012e655a52220a6a151019  kdebase-3.5.6.tar.bz2
 d52f08756a8d3e9df478506bd258a4d8  kde-redhat-config-3.5-fc7-1.tar.bz2
+b421e01b3ee712549ee967f58ed24de0  kdebase-3.5.7.tar.bz2


--- kdebase-3.4.2-npapi-64bit-fixes.patch DELETED ---


--- kdebase-3.5.4-antialias.patch DELETED ---


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