[kdebase-workspace] - 4.5.80 (4.6beta1)
Rex Dieter
rdieter at fedoraproject.org
Sat Nov 20 18:36:34 UTC 2010
commit b689a72762e3794239a3991feb553d37aa49316a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Nov 20 12:37:19 2010 -0600
- 4.5.80 (4.6beta1)
.gitignore | 3 +-
kdebase-workspace-4.4.85-kdebug238325.patch | 236 ---------
kdebase-workspace-4.4.92-kdm_plymouth.patch | 55 ---
kdebase-workspace-4.5.2-ck-shutdown.patch | 310 ------------
kdebase-workspace-4.5.2-krandrtray_backport.patch | 508 --------------------
...5.2-kwin_unredirect_fullscreen_windows_ui.patch | 93 ----
... kdebase-workspace-4.5.80-redhat_startkde.patch | 55 +--
kdebase-workspace-kdm-autologin.patch | 12 -
kdebase-workspace.spec | 60 +--
sources | 2 +-
10 files changed, 26 insertions(+), 1308 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e4e55f..db60ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kdebase-workspace-4.5.2.tar.bz2
-/kdebase-workspace-4.5.3.tar.bz2
+/kdebase-workspace-4.5.80.tar.bz2
diff --git a/kdebase-workspace-4.5.1-redhat_startkde.patch b/kdebase-workspace-4.5.80-redhat_startkde.patch
similarity index 59%
rename from kdebase-workspace-4.5.1-redhat_startkde.patch
rename to kdebase-workspace-4.5.80-redhat_startkde.patch
index bc3fea8..ec99137 100644
--- a/kdebase-workspace-4.5.1-redhat_startkde.patch
+++ b/kdebase-workspace-4.5.80-redhat_startkde.patch
@@ -1,43 +1,7 @@
-diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspace-4.5.1/startkde.cmake
---- kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde 2010-08-27 03:10:26.000000000 -0500
-+++ kdebase-workspace-4.5.1/startkde.cmake 2010-09-20 12:12:17.390323286 -0500
-@@ -25,33 +25,17 @@ elif test $kcheckrunning_result -eq 2 ;
- exit 1
- fi
-
--# Set the background to plain grey.
-+# Set the background to the Red Hat default.
- # 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 "#103D77"
- fi
-
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
-
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
-- qbindir=`$bindir/kde4-config --qt-binaries`
-- if [ -n "$qbindir" ]; then
-- case $PATH in
-- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-- *) PATH=$qbindir:$PATH; export PATH;;
-- esac
-- fi
-- case $PATH in
-- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-- *) PATH=$bindir:$PATH; export PATH;;
-- esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -72,6 +56,37 @@ fi
+diff -up kdebase-workspace-4.5.80/startkde.cmake.redhat_startkde kdebase-workspace-4.5.80/startkde.cmake
+--- kdebase-workspace-4.5.80/startkde.cmake.redhat_startkde 2010-10-27 14:55:06.000000000 -0500
++++ kdebase-workspace-4.5.80/startkde.cmake 2010-11-20 12:26:08.092613584 -0600
+@@ -84,6 +84,37 @@ fi
kdehome=$HOME/@KDE_DEFAULT_HOME@
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
@@ -75,10 +39,11 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
# see kstartupconfig source for usage
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
-@@ -88,7 +103,15 @@ kcmrandrrc [Screen2]
- kcmrandrrc [Screen3]
+@@ -100,8 +131,15 @@ krandrrc [Screen1]
+ krandrrc [Screen2]
+ krandrrc [Screen3]
kcmfonts General forceFontDPI 0
- kdeglobals Locale Language '' # trigger requesting languages from KLocale
+-kdeglobals Locale Language '' # trigger requesting languages from KLocale
+kdeglobals Locale Country ''
EOF
+# read the default KSplash theme to use out of kde-settings
@@ -91,7 +56,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
kstartupconfig4
returncode=$?
if test $returncode -ne 0; then
-@@ -209,8 +232,9 @@ fi
+@@ -180,8 +218,9 @@ fi
# better use the Autostart folder.
libpath=`kde4-config --path lib | tr : '\n'`
@@ -102,7 +67,7 @@ diff -up kdebase-workspace-4.5.1/startkde.cmake.redhat-startkde kdebase-workspac
for file in "$prefix"*.sh; do
test -r "$file" && . "$file"
done
-@@ -423,7 +447,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
+@@ -394,7 +433,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
echo 'startkde: Running shutdown scripts...' 1>&2
# Run scripts found in $KDEDIRS/shutdown
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 87b203a..fad7ff2 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -1,32 +1,25 @@
%define polkit_1 1
-#define polkit_09 1
-
-%if 0%{?fedora} > 12
-%define plymouth_hack_ping 1
-%else
-%define plymouth_hack_spool 1
-%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: KDE Workspace
Name: kdebase-workspace
-Version: 4.5.3
+Version: 4.5.80
# for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
%define kde4workspace_version %{version}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: GPLv2
Group: User Interface/Desktops
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# RH/Fedora-specific startkde changes
-Patch1: kdebase-workspace-4.5.1-redhat_startkde.patch
+Patch1: kdebase-workspace-4.5.80-redhat_startkde.patch
# add konsole menuitem
Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -60,9 +53,6 @@ Patch16: kdebase-workspace-4.4.80-battery-plasmoid-showremainingtime.patch
# default Leave submenu
Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
-# support plymouth in kdm
-Patch18: kdebase-workspace-4.4.92-kdm_plymouth.patch
-
# kubuntu kudos! bulletproof-X bits ripped out
Patch19: kdebase-workspace-4.4.92-kdm_plymouth081.patch
Patch20: kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch
@@ -77,31 +67,13 @@ Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
# "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
Patch50: kdebase-workspace-4.3.3-kde#171685.patch
-# "Adding "Enable networking" button to knetworkmanager"
-# https://bugzilla.redhat.com/598765 https://bugs.kde.org/238325
-Patch52: kdebase-workspace-4.4.85-kdebug238325.patch
-
# Error in file "/usr/share/applications/kde4/kfontview.desktop":
# "fonts/package" is an invalid MIME type http://bugzilla.redhat.com/581896
Patch54: kdebase-workspace-4.5.1-kfontview_dt_validate.patch
-## 4.5 patches
-# fix crash on automatic re-login after automatic login
-Patch100: kdebase-workspace-kdm-autologin.patch
+## 4.6 patches
## trunk patches
-# Display Settings are Lost on Logout, http://bugs.kde.org/183143 , http://bugzilla.redhat.com/607180
-# backport http://websvn.kde.org/?view=revision&revision=1170315
-Patch150: kdebase-workspace-4.5.2-krandrtray_backport.patch
-
-# http://websvn.kde.org/?revision=1176432&view=revision
-Patch151: kdebase-workspace-4.5.2-kwin_unredirect_fullscreen_windows_ui.patch
-
-# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM >= 2.22, #431817)
-# and support for GDM >= 2.22 session switching (#560511), see kde#186198
-# backport of http://websvn.kde.org/?view=revision&revision=1186881 and the
-# followup http://websvn.kde.org/?view=revision&revision=1190424 (NoDM case)
-Patch152: kdebase-workspace-4.5.2-ck-shutdown.patch
# moving to non-multilib hack
Obsoletes: kdebase-workspace < 4.3.0-2
@@ -324,6 +296,7 @@ Requires: akonadi
%setup -q -n kdebase-workspace-%{version}
%patch1 -p1 -b .redhat_startkde
+# FIXME, I believe there are better ways of doing this now -- Rex
%patch2 -p1 -b .plasma-konsole
%patch3 -p1 -b .systemsettings_onlyshowin_kde
%patch7 -p0 -b .krdb
@@ -331,30 +304,22 @@ Requires: akonadi
%patch9 -p1 -b .rootprivs
%patch11 -p1 -b .font
%patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .showremainingtime
-%patch17 -p1 -b .classicmenu-logout
-%if 0%{?plymouth_hack_spool}
-%patch18 -p1 -b .kdm_plymouth
-%endif
-%if 0%{?plymouth_hack_ping}
+# FIXME, rebase? -- Rex
+#patch16 -p1 -b .showremainingtime
+# FIXME, rebase? drop? -- Rex
+#patch17 -p1 -b .classicmenu-logout
%patch19 -p1 -b .kdm_plymouth
-%endif
%patch20 -p1 -b .xsession_errors_O_APPEND
%patch21 -p1 -b .platformplugin-widgetstyle4
%patch23 -p1 -b .startkde_zenity
# upstream patches
%patch50 -p1 -b .kde#171685
-%patch52 -p1 -b .kdebug238325
%patch54 -p1 -b .kfontview_dt_validate
-# 4.5 patches
-%patch100 -p1 -b .kdm-autologin
+# 4.6 patches
# trunk patches
-%patch150 -p1 -b .krandrtray_backport
-%patch151 -p1 -b .kwin_unredirect_fullscreen_windows_ui
-%patch152 -p1 -b .ck-shutdown
%build
@@ -728,6 +693,9 @@ fi
%changelog
+* Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.80-1
+- 4.5.80 (4.6beta1)
+
* Mon Nov 15 2010 Than Ngo <than at redhat.com> - 4.5.3-3
- apply patch to fix crash on automatic re-login after automatic login
diff --git a/sources b/sources
index ad70c2d..eb358ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9537fb2e759c8bff53bd73512b006539 kdebase-workspace-4.5.3.tar.bz2
+ef875cc780b30e5e8d917896f6c0c2f2 kdebase-workspace-4.5.80.tar.bz2
More information about the scm-commits
mailing list