[kdebase-workspace/f14/master: 48/48] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit 72e37448fb5dc7dc30dfc981a94de5b860d26043
Merge: 218d442 d4e1bcc
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Mar 15 17:41:24 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdebase-workspace.spec
    	sources

 .gitignore                                         |    2 +-
 ...4.4.80-battery-plasmoid-showremainingtime.patch |   16 -
 kdebase-workspace-4.4.85-kdebug238325.patch        |  236 ---------
 kdebase-workspace-4.4.92-kdm_plymouth.patch        |   55 ---
 ...ase-workspace-4.5.1-kfontview_dt_validate.patch |   12 -
 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 ----
 ...4.5.80-battery-plasmoid-showremainingtime.patch |   16 +
 ...ebase-workspace-4.5.80-classicmenu-logout.patch |   28 +-
 ... kdebase-workspace-4.5.80-redhat_startkde.patch |   55 +--
 kdebase-workspace-4.5.85-no_HAL.patch              |   31 ++
 kdebase-workspace-4.5.90-no_HAL2.patch             |   29 ++
 kdebase-workspace-4.6.1-solid_nm_emit.patch        |   18 +
 kdebase-workspace.spec                             |  373 +++++++++------
 sources                                            |    2 +-
 16 files changed, 344 insertions(+), 1440 deletions(-)
---
diff --cc kdebase-workspace.spec
index 33eb599,962bc2e..4c2999e
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@@ -12,12 -3,12 +3,12 @@@
  
  Summary: KDE Workspace
  Name:    kdebase-workspace
- Version: 4.5.5
+ Version: 4.6.1
  
  # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
- %define kde4workspace_version %{version} 
+ %define kde4workspace_version 4.6.1
  
 -Release: 3%{?dist}
 +Release: 2%{?dist}
  
  License: GPLv2
  Group:   User Interface/Desktops
@@@ -77,33 -65,17 +65,20 @@@ Patch23: kdebase-workspace-4.5.2-startk
  # "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 
+ ## 4.6 patches
+ # https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/2ec6533494a23164ee9c2de4ab65d5fa372aff5c
+ Patch100: kdebase-workspace-4.6.1-solid_nm_emit.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
- 
- # stable upstream patches
+ ## Fedora specific patches
+ # HALsectomy
+ Patch200: kdebase-workspace-4.5.85-no_HAL.patch
+ Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
  
  ## 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
  
 +# backport of http://websvn.kde.org/?revision=1214119&view=revision
 +Patch153: kdebase-workspace-4.5.5-hal_brightnessInHardware_false.patch
 +
  # moving to non-multilib hack
  Obsoletes: kdebase-workspace < 4.3.0-2