From c553cbaf0f64339d9f28a894a3d16080646dc28c Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Sep 30 2015 00:18:55 +0000 Subject: debrand --- diff --git a/SOURCES/kde-settings-19-23-centos.patch b/SOURCES/kde-settings-19-23-centos.patch new file mode 100644 index 0000000..a627e0b --- /dev/null +++ b/SOURCES/kde-settings-19-23-centos.patch @@ -0,0 +1,667 @@ +diff -Nur kde-settings-19-23.orig/etc/kde/env/fedora-bookmarks.sh kde-settings-19-23/etc/kde/env/fedora-bookmarks.sh +--- kde-settings-19-23.orig/etc/kde/env/fedora-bookmarks.sh 2008-07-08 20:26:57.000000000 +0200 ++++ kde-settings-19-23/etc/kde/env/fedora-bookmarks.sh 1970-01-01 01:00:00.000000000 +0100 +@@ -1,9 +0,0 @@ +-#! /bin/sh +- +-# copy default bookmarks to users homedir if not existing yet +-if [ ! -e $HOME/.kde/share/apps/konqueror/bookmarks.xml ] \ +- && [ -e /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml ]; then +- mkdir -p $HOME/.kde/share/apps/konqueror/ +- cp -p /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml \ +- $HOME/.kde/share/apps/konqueror/bookmarks.xml +-fi +diff -Nur kde-settings-19-23.orig/etc/kde/kdm/kdmrc kde-settings-19-23/etc/kde/kdm/kdmrc +--- kde-settings-19-23.orig/etc/kde/kdm/kdmrc 2013-05-31 14:59:28.000000000 +0200 ++++ kde-settings-19-23/etc/kde/kdm/kdmrc 2013-07-31 16:42:50.641075830 +0200 +@@ -294,7 +294,7 @@ + LogoArea=Logo + # The image to show when LogoArea=Logo. + # Default is "" +-LogoPixmap=/usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ++LogoPixmap=/usr/share/icons/hicolor/96x96/apps/system-logo-icon.png + # The relative coordinates (X,Y in percent) of the center of the greeter. + # Default is "50,50" + #GreeterPos=30,40 +@@ -313,7 +313,7 @@ + # - %m -> the machine (hardware) type + # - %% -> a single % + # Default is "Welcome to %s at %n" +-GreetString=Fedora 19 (Schrödinger's Cat) ++GreetString=Red Hat Enterprise Linux + # The font for the greeter headline. + # Default is "charter,24,bold" + GreetFont=Sans,16,-1,5,75,0,0,0,0,0 +@@ -443,7 +443,7 @@ + UseTheme=true + # The theme to use for the greeter. Can point to either a directory or an XML + # file. Default is "/usr/share/kde4/apps/kdm/themes/circles" +-Theme=/usr/share/kde4/apps/kdm/themes/SchroedingerCat ++Theme=/usr/share/kde4/apps/kdm/themes/CentOS7 + # Set the widget color scheme + #ColorScheme=ObsidianCoast + +diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh +--- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh 2013-01-28 21:03:17.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh 1970-01-01 01:00:00.000000000 +0100 +@@ -1,11 +0,0 @@ +-#!/bin/sh +- +-if [ "`kreadconfig --file fedora-kde-display-handlerrc --group General --key LastRun`" = "kscreen" ]; then +- # bail-out/short-circuit +- exit 0 +-else +- kwriteconfig --file kdedrc --group Module-kscreen --key autoload true +- kwriteconfig --file kdedrc --group Module-randrmonitor --key autoload false +- kwriteconfig --file fedora-kde-display-handlerrc --group General --key LastRun kscreen +- exit 0 +-fi +diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd +--- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd 2013-01-28 21:03:17.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd 1970-01-01 01:00:00.000000000 +0100 +@@ -1,2 +0,0 @@ +-Id=4.10fedora-kde-display-handler +-Script=fedora-kde-display-handler.sh +diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.sh kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.sh +--- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.sh 1970-01-01 01:00:00.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.sh 2013-07-31 16:42:50.641075830 +0200 +@@ -0,0 +1,11 @@ ++#!/bin/sh ++ ++if [ "`kreadconfig --file kde-display-handlerrc --group General --key LastRun`" = "kscreen" ]; then ++ # bail-out/short-circuit ++ exit 0 ++else ++ kwriteconfig --file kdedrc --group Module-kscreen --key autoload true ++ kwriteconfig --file kdedrc --group Module-randrmonitor --key autoload false ++ kwriteconfig --file kde-display-handlerrc --group General --key LastRun kscreen ++ exit 0 ++fi +diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.upd kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.upd +--- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.upd 1970-01-01 01:00:00.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.upd 2013-07-31 16:42:50.641075830 +0200 +@@ -0,0 +1,2 @@ ++Id=4.10kde-display-handler ++Script=kde-display-handler.sh +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml 2013-04-24 15:06:48.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,121 +0,0 @@ +- +- +- +- +- Fedora Bookmarks +- +- Release Notes +- +- +- +- +- +- +- +- Fedora Project +- +- Fedora Project +- +- +- Fedora Forum +- +- +- +- +- +- +- +- Fedora Weekly News +- +- +- Fedora Unity Project +- +- +- +- +- +- +- +- Fedora People +- +- +- +- +- +- +- +- More Support & Discussion +- +- +- +- Red Hat +- +- Red Hat Magazine +- +- +- +- +- +- +- +- Red Hat +- +- +- +- +- +- +- +- JBoss +- +- +- +- +- +- +- +- +- Free Content +- +- Wikipedia +- +- +- OK +- +- +- +- +- Jamendo +- +- +- OK +- +- +- +- +- Magnatune +- +- +- OK +- +- +- +- +- The Freesound Project +- +- +- OK +- +- +- +- +- Creative Commons +- +- +- +- +- +- +- +- +- +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing 2011-03-24 18:58:53.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing 1970-01-01 01:00:00.000000000 +0100 +@@ -1,62 +0,0 @@ +-[Profile] +-FullScreen=false +-Height=80% +-Name=Tabbed Browsing +-RootItem=Tabs0 +-Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3 +-Tabs0_activeChildIndex=0 +-ViewT0_LinkedView=false +-ViewT0_LockedLocation=false +-ViewT0_PassiveMode=false +-ViewT0_ServiceName=khtml +-ViewT0_ServiceType=text/html +-ViewT0_ToggleView=false +-ViewT0_URL=http://start.fedoraproject.org/ +-ViewT1_LinkedView=false +-ViewT1_LockedLocation=false +-ViewT1_PassiveMode=false +-ViewT1_ServiceName=khtml +-ViewT1_ServiceType=text/html +-ViewT1_ToggleView=false +-ViewT1_URL=http://fedoraproject.org/wiki/KDE +-ViewT2_LinkedView=false +-ViewT2_LockedLocation=false +-ViewT2_PassiveMode=false +-ViewT2_ServiceName=khtml +-ViewT2_ServiceType=text/html +-ViewT2_ToggleView=false +-ViewT2_URL=http://planet.fedoraproject.org/ +-ViewT3_LinkedView=false +-ViewT3_LockedLocation=false +-ViewT3_PassiveMode=false +-ViewT3_ServiceName=khtml +-ViewT3_ServiceType=text/html +-ViewT3_ToggleView=false +-ViewT3_URL=http://forums.fedoraforum.org/ +-Width=80% +-XMLUIFile=konq-webbrowsing.rc +- +-[Profile][Toolbar bookmarkToolBar] +-IconSize=16 +-Index=3 +-ToolButtonStyle=TextBesideIcon +- +-[Profile][Toolbar extraToolBar] +-Index=1 +-ToolButtonStyle=TextUnderIcon +- +-[Profile][Toolbar htmlToolBar] +-Index=4 +-ToolButtonStyle=IconOnly +- +-[Profile][Toolbar locationToolBar] +-Index=2 +-ToolButtonStyle=IconOnly +- +-[Profile][Toolbar mainToolBar] +-Index=0 +- +-[Profile][Toolbar speechToolbar] +-Hidden=true +-Index=5 +-ToolButtonStyle=TextUnderIcon +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing 2011-03-17 15:07:57.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing 2013-07-31 16:42:50.642075830 +0200 +@@ -4,5 +4,5 @@ + RootItem=View0 + View0_ServiceName=khtml + View0_ServiceType=text/html +-View0_URL=http://start.fedoraproject.org/ ++View0_URL=file:///usr/share/doc/HTML/index.html + Width=80% +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js 2011-10-15 19:39:39.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js 1970-01-01 01:00:00.000000000 +0100 +@@ -1,59 +0,0 @@ +-loadTemplate("org.kde.plasma-desktop.defaultPanel") +- +-function noDisplayEvents(widget, containment) +-{ +- widget.writeConfig("displayEvents", false); +-} +- +-var findWidgetsTemplate = loadTemplate("org.kde.plasma-desktop.findWidgets"); +-findWidgetsTemplate.findWidgets("digital-clock", noDisplayEvents); +- +-function widgetExists(name) +-{ +- var widgets = knownWidgetTypes; +- for (i in widgets) { +- if (widgets[i] == name) { +- return true; +- } +- } +- +- return false; +-} +- +-var topLeftScreen = 0 +-var rect = screenGeometry(0) +- +-// find our "top left" screen to put the folderview on it +-for (var i = 1; i < screenCount; ++i) { +- var g = screenGeometry(i) +- +- if (g.x <= rect.x && g.top >= rect.top) { +- rect = g +- topLeftScreen = i +- } +-} +- +-var hasFolderview = widgetExists("folderview"); +- +-for (var i = 0; i < screenCount; ++i) { +- var desktop = new Activity +- desktop.name = i18n("Desktop") +- desktop.screen = i +- desktop.wallpaperPlugin = 'image' +- desktop.wallpaperMode = 'SingleImage' +- +- if (hasFolderview && i == topLeftScreen) { +- var folderview = desktop.addWidget("folderview") +- folderview.writeConfig("url", "desktop:/") +- } +- +- //Create more panels for other screens +- if (i > 0){ +- var panel = new Panel +- panel.screen = i +- panel.location = 'bottom' +- panel.height = panels()[i].height = screenGeometry(0).height > 1024 ? 35 : 27 +- var tasks = panel.addWidget("tasks") +- tasks.writeConfig("showOnlyCurrentScreen", true); +- } +-} +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js 2010-10-09 21:00:10.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js 1970-01-01 01:00:00.000000000 +0100 +@@ -1,47 +0,0 @@ +-/* +- 00-start-here-kde-fedora.js - Set launcher icon to start-here-kde-fedora +- Copyright (C) 2010 Kevin Kofler +- Copyright (C) 2010 Rex Dieter +- +- This program is free software: you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation, either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program. If not, see . +- +- Portions lifted from 01-kubuntu-10.04.js: +- Harald Sitter, apachelogger@ubuntu.com 2010-04-02 +- Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 +- Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later +-*/ +- +-launcherFound = false; +- +-pids = panelIds; +-for (i = 0; i < pids.length; ++i) { +- p = panelById(pids[i]); +- if (!p) continue; +- ids = p.widgetIds; +- for (j = 0; j < ids.length; ++j) { +- w = p.widgetById(ids[j]); +- if (!w || (w.type != "launcher" && w.type != "simplelauncher")) continue; +- launcherFound = true; +- if ( w.readConfig("icon", "start-here-kde") == "start-here-kde" || +- w.readConfig("icon", "start-here-kde") == "start-here" ) { +- w.writeConfig("icon", "start-here-kde-fedora"); +- } +- break; +- } +- if (launcherFound) break; +-} +-if (!launcherFound) +- print("No launcher found"); +- +- +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js 1970-01-01 01:00:00.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js 2013-07-31 20:48:58.788421067 +0200 +@@ -0,0 +1,50 @@ ++/* ++ 00-start-here-kde.js - Set launcher icon to start-here-kde ++ Copyright (C) 2010 Kevin Kofler ++ Copyright (C) 2010 Rex Dieter ++ Copyright (C) 2013 Than Ngo ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ ++ Portions lifted from 01-kubuntu-10.04.js: ++ Harald Sitter, apachelogger@ubuntu.com 2010-04-02 ++ Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 ++ Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later ++ ++ Modified for rhel 2013-07-30 ++*/ ++ ++launcherFound = false; ++ ++pids = panelIds; ++for (i = 0; i < pids.length; ++i) { ++ p = panelById(pids[i]); ++ if (!p) continue; ++ ids = p.widgetIds; ++ for (j = 0; j < ids.length; ++j) { ++ w = p.widgetById(ids[j]); ++ if (!w || (w.type != "launcher" && w.type != "simplelauncher")) continue; ++ launcherFound = true; ++ if ( w.readConfig("icon", "start-here-kde") == "start-here-kde" || ++ w.readConfig("icon", "start-here-kde") == "start-here" ) { ++ w.writeConfig("icon", "system-logo-icon"); ++ } ++ break; ++ } ++ if (launcherFound) break; ++} ++if (!launcherFound) ++ print("No launcher found"); ++ ++ +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals 2010-09-03 16:30:38.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals 2013-07-31 20:53:51.498410604 +0200 +@@ -8,16 +8,17 @@ + font=Sans Serif,10,-1,5,50,0,0,0,0,0 + menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0 + smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0 ++taskbarFont=Sans Serif,9,-1,5,50,0,0,0,0,0 + toolBarFont=Sans Serif,10,-1,5,50,0,0,0,0,0 + widgetStyle=oxygen + XftAntialias=true + + [WM] +-activeFont=Sans Serif,9,-1,5,50,0,0,0,0,0 ++activeFont=Sans Serif,9,-1,5,75,0,0,0,0,0 + + [Icons] + # See http://bugzilla.redhat.com/615621 (Inherits=oxygen gone bad) +-#Theme=Fedora-KDE ++#Theme=oxygen + + [KSpell] + KSpell_Client=4 +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc 2013-05-22 15:14:41.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc 2013-07-31 16:42:50.643075830 +0200 +@@ -24,4 +24,4 @@ + WordWrapText=true + + [UserSettings] +-HomeURL=http://start.fedoraproject.org/ ++HomeURL=file:///usr/share/doc/HTML/index.html +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konversationrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konversationrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konversationrc 2009-09-08 17:16:56.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konversationrc 2013-07-31 16:42:50.643075830 +0200 +@@ -1,13 +1,7 @@ + [Channel 0] +-Name=#fedora +- +-[Channel 1] +-Name=#fedora-kde +- +-[Channel 2] + Name=#kde + +-[Channel 3] ++[Channel 1] + Name=#konversation + + [Server 0] +@@ -17,7 +11,7 @@ + + [ServerGroup 0] + AutoConnect=false +-AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3 ++AutoJoinChannels=Channel 0,Channel 1 + EnableNotifications=true + Expanded=false + Name=Freenode +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc 2013-03-28 17:24:28.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc 2013-07-31 16:42:50.643075830 +0200 +@@ -1,2 +1,2 @@ + [KSplash] +-Theme=SchroedingerCat +\ Kein Zeilenumbruch am Dateiende. ++Theme=CentOS7 +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kwinrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kwinrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kwinrc 2012-01-16 21:38:21.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kwinrc 2013-07-31 20:55:10.385407784 +0200 +@@ -1,6 +1,13 @@ + [Style] + PluginLib=kwin3_oxygen +-ShowToolTips=true ++ShowToolTips=false ++BorderSize=1 ++ButtonsOnLeft= ++ButtonsOnRight=IA_X ++CustomButtonPositions=true ++ ++[Compositing] ++Enabled=false + + [Windows] + AutoRaise=off +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc 2009-12-24 03:14:26.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc 2013-07-31 21:06:05.855384354 +0200 +@@ -1,5 +1,5 @@ + [Basic Settings] +-Start Nepomuk=true ++Start Nepomuk=false + + [Service-nepomukstrigiservice] +-autostart=true ++autostart=false +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc 1970-01-01 01:00:00.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc 2013-07-31 20:55:45.761406519 +0200 +@@ -0,0 +1,3 @@ ++[Windeco] ++FrameBorder=No Side Border ++UseOxygenShadows=false +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/plasmarc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/plasmarc 2013-03-28 17:24:28.000000000 +0100 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc 2013-07-31 16:42:50.643075830 +0200 +@@ -1,5 +1,2 @@ + [Theme] +-name=Schroedinger_Cat +- +-[Theme-plasma-netbook] +-name=Schroedinger_Cat-netbook ++name=CentOS7 +diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js kde-settings-19-23/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js +--- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js 2012-09-24 18:22:21.000000000 +0200 ++++ kde-settings-19-23/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js 1970-01-01 01:00:00.000000000 +0100 +@@ -1,62 +0,0 @@ +-loadTemplate("org.kde.plasma-desktop.defaultPanel") +- +-function noDisplayEvents(widget, containment) +-{ +- widget.writeConfig("displayEvents", false); +-} +- +-var findWidgetsTemplate = loadTemplate("org.kde.plasma-desktop.findWidgets"); +-findWidgetsTemplate.findWidgets("digital-clock", noDisplayEvents); +- +-function widgetExists(name) +-{ +- var widgets = knownWidgetTypes; +- for (i in widgets) { +- if (widgets[i] == name) { +- return true; +- } +- } +- +- return false; +-} +- +-for (var i = 0; i < screenCount; ++i) { +- var desktop = new Activity +- desktop.name = i18n("Desktop") +- desktop.screen = i +- desktop.wallpaperPlugin = 'image' +- desktop.wallpaperMode = 'SingleImage' +- +- //Create more panels for other screens +- if (i > 0){ +- var panel = new Panel +- panel.screen = i +- panel.location = 'bottom' +- panel.height = panels()[i].height = screenGeometry(0).height > 1024 ? 35 : 27 +- var tasks = panel.addWidget("tasks") +- tasks.writeConfig("showOnlyCurrentScreen", true); +- } +- +-} +- +-// Replace existing launcher with simplelauncher +- +-var pids = panelIds; +- +-for (var i = 0; i < pids.length; ++i) { +- var p = panelById(pids[i]); +- if (!p) continue; +- var ids = p.widgetIds; +- +- for (var j = 0; j < ids.length; ++j) { +- var w = p.widgetById(ids[j]); +- if (!w || w.type != "launcher") continue; +- +- w.remove(); +- var launcher = p.addWidget("simplelauncher"); +- launcher.index = 0; +- launcher.writeConfig("icon", "start-here-kde-fedora"); +- break; +- } +- +-} +diff -Nur kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules kde-settings-19-23/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules +--- kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules 2012-10-12 18:19:06.000000000 +0200 ++++ kde-settings-19-23/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules 1970-01-01 01:00:00.000000000 +0100 +@@ -1,13 +0,0 @@ +-// kde-settings authorizations/policy for the wheel group. +-// +-// DO NOT EDIT THIS FILE, it will be overwritten on update. +-// +-// Allow users in the wheel group to do set the clock in kcm_clock without being +-// interrupted by a password dialog +- +-polkit.addRule(function(action, subject) { +- if (action.id == "org.kde.kcontrol.kcmclock.save" && +- subject.isInGroup("wheel") && subject.active) { +- return polkit.Result.YES; +- } +-}); +diff -Nur kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-kde-policy.rules kde-settings-19-23/usr/share/polkit-1/rules.d/11-kde-policy.rules +--- kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-kde-policy.rules 1970-01-01 01:00:00.000000000 +0100 ++++ kde-settings-19-23/usr/share/polkit-1/rules.d/11-kde-policy.rules 2013-07-31 16:42:50.644075830 +0200 +@@ -0,0 +1,13 @@ ++// kde-settings authorizations/policy for the wheel group. ++// ++// DO NOT EDIT THIS FILE, it will be overwritten on update. ++// ++// Allow users in the wheel group to do set the clock in kcm_clock without being ++// interrupted by a password dialog ++ ++polkit.addRule(function(action, subject) { ++ if (action.id == "org.kde.kcontrol.kcmclock.save" && ++ subject.isInGroup("wheel") && subject.active) { ++ return polkit.Result.YES; ++ } ++}); diff --git a/SOURCES/kde-settings-19-23-rhel.patch b/SOURCES/kde-settings-19-23-rhel.patch deleted file mode 100644 index 6c2d5e3..0000000 --- a/SOURCES/kde-settings-19-23-rhel.patch +++ /dev/null @@ -1,667 +0,0 @@ -diff -Nur kde-settings-19-23.orig/etc/kde/env/fedora-bookmarks.sh kde-settings-19-23/etc/kde/env/fedora-bookmarks.sh ---- kde-settings-19-23.orig/etc/kde/env/fedora-bookmarks.sh 2008-07-08 20:26:57.000000000 +0200 -+++ kde-settings-19-23/etc/kde/env/fedora-bookmarks.sh 1970-01-01 01:00:00.000000000 +0100 -@@ -1,9 +0,0 @@ --#! /bin/sh -- --# copy default bookmarks to users homedir if not existing yet --if [ ! -e $HOME/.kde/share/apps/konqueror/bookmarks.xml ] \ -- && [ -e /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml ]; then -- mkdir -p $HOME/.kde/share/apps/konqueror/ -- cp -p /usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml \ -- $HOME/.kde/share/apps/konqueror/bookmarks.xml --fi -diff -Nur kde-settings-19-23.orig/etc/kde/kdm/kdmrc kde-settings-19-23/etc/kde/kdm/kdmrc ---- kde-settings-19-23.orig/etc/kde/kdm/kdmrc 2013-05-31 14:59:28.000000000 +0200 -+++ kde-settings-19-23/etc/kde/kdm/kdmrc 2013-07-31 16:42:50.641075830 +0200 -@@ -294,7 +294,7 @@ - LogoArea=Logo - # The image to show when LogoArea=Logo. - # Default is "" --LogoPixmap=/usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png -+LogoPixmap=/usr/share/icons/hicolor/96x96/apps/system-logo-icon.png - # The relative coordinates (X,Y in percent) of the center of the greeter. - # Default is "50,50" - #GreeterPos=30,40 -@@ -313,7 +313,7 @@ - # - %m -> the machine (hardware) type - # - %% -> a single % - # Default is "Welcome to %s at %n" --GreetString=Fedora 19 (Schrödinger's Cat) -+GreetString=Red Hat Enterprise Linux - # The font for the greeter headline. - # Default is "charter,24,bold" - GreetFont=Sans,16,-1,5,75,0,0,0,0,0 -@@ -443,7 +443,7 @@ - UseTheme=true - # The theme to use for the greeter. Can point to either a directory or an XML - # file. Default is "/usr/share/kde4/apps/kdm/themes/circles" --Theme=/usr/share/kde4/apps/kdm/themes/SchroedingerCat -+Theme=/usr/share/kde4/apps/kdm/themes/RHEL7 - # Set the widget color scheme - #ColorScheme=ObsidianCoast - -diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh ---- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh 2013-01-28 21:03:17.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.sh 1970-01-01 01:00:00.000000000 +0100 -@@ -1,11 +0,0 @@ --#!/bin/sh -- --if [ "`kreadconfig --file fedora-kde-display-handlerrc --group General --key LastRun`" = "kscreen" ]; then -- # bail-out/short-circuit -- exit 0 --else -- kwriteconfig --file kdedrc --group Module-kscreen --key autoload true -- kwriteconfig --file kdedrc --group Module-randrmonitor --key autoload false -- kwriteconfig --file fedora-kde-display-handlerrc --group General --key LastRun kscreen -- exit 0 --fi -diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd ---- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd 2013-01-28 21:03:17.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/fedora-kde-display-handler.upd 1970-01-01 01:00:00.000000000 +0100 -@@ -1,2 +0,0 @@ --Id=4.10fedora-kde-display-handler --Script=fedora-kde-display-handler.sh -diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.sh kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.sh ---- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.sh 1970-01-01 01:00:00.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.sh 2013-07-31 16:42:50.641075830 +0200 -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ -+if [ "`kreadconfig --file kde-display-handlerrc --group General --key LastRun`" = "kscreen" ]; then -+ # bail-out/short-circuit -+ exit 0 -+else -+ kwriteconfig --file kdedrc --group Module-kscreen --key autoload true -+ kwriteconfig --file kdedrc --group Module-randrmonitor --key autoload false -+ kwriteconfig --file kde-display-handlerrc --group General --key LastRun kscreen -+ exit 0 -+fi -diff -Nur kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.upd kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.upd ---- kde-settings-19-23.orig/usr/share/kde4/apps/kconf_update/kde-display-handler.upd 1970-01-01 01:00:00.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde4/apps/kconf_update/kde-display-handler.upd 2013-07-31 16:42:50.641075830 +0200 -@@ -0,0 +1,2 @@ -+Id=4.10kde-display-handler -+Script=kde-display-handler.sh -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml 2013-04-24 15:06:48.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/bookmarks.xml 1970-01-01 01:00:00.000000000 +0100 -@@ -1,121 +0,0 @@ -- -- -- -- -- Fedora Bookmarks -- -- Release Notes -- -- -- -- -- -- -- -- Fedora Project -- -- Fedora Project -- -- -- Fedora Forum -- -- -- -- -- -- -- -- Fedora Weekly News -- -- -- Fedora Unity Project -- -- -- -- -- -- -- -- Fedora People -- -- -- -- -- -- -- -- More Support & Discussion -- -- -- -- Red Hat -- -- Red Hat Magazine -- -- -- -- -- -- -- -- Red Hat -- -- -- -- -- -- -- -- JBoss -- -- -- -- -- -- -- -- -- Free Content -- -- Wikipedia -- -- -- OK -- -- -- -- -- Jamendo -- -- -- OK -- -- -- -- -- Magnatune -- -- -- OK -- -- -- -- -- The Freesound Project -- -- -- OK -- -- -- -- -- Creative Commons -- -- -- -- -- -- -- -- -- -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing 2011-03-24 18:58:53.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/tabbedbrowsing 1970-01-01 01:00:00.000000000 +0100 -@@ -1,62 +0,0 @@ --[Profile] --FullScreen=false --Height=80% --Name=Tabbed Browsing --RootItem=Tabs0 --Tabs0_Children=ViewT0,ViewT1,ViewT2,ViewT3 --Tabs0_activeChildIndex=0 --ViewT0_LinkedView=false --ViewT0_LockedLocation=false --ViewT0_PassiveMode=false --ViewT0_ServiceName=khtml --ViewT0_ServiceType=text/html --ViewT0_ToggleView=false --ViewT0_URL=http://start.fedoraproject.org/ --ViewT1_LinkedView=false --ViewT1_LockedLocation=false --ViewT1_PassiveMode=false --ViewT1_ServiceName=khtml --ViewT1_ServiceType=text/html --ViewT1_ToggleView=false --ViewT1_URL=http://fedoraproject.org/wiki/KDE --ViewT2_LinkedView=false --ViewT2_LockedLocation=false --ViewT2_PassiveMode=false --ViewT2_ServiceName=khtml --ViewT2_ServiceType=text/html --ViewT2_ToggleView=false --ViewT2_URL=http://planet.fedoraproject.org/ --ViewT3_LinkedView=false --ViewT3_LockedLocation=false --ViewT3_PassiveMode=false --ViewT3_ServiceName=khtml --ViewT3_ServiceType=text/html --ViewT3_ToggleView=false --ViewT3_URL=http://forums.fedoraforum.org/ --Width=80% --XMLUIFile=konq-webbrowsing.rc -- --[Profile][Toolbar bookmarkToolBar] --IconSize=16 --Index=3 --ToolButtonStyle=TextBesideIcon -- --[Profile][Toolbar extraToolBar] --Index=1 --ToolButtonStyle=TextUnderIcon -- --[Profile][Toolbar htmlToolBar] --Index=4 --ToolButtonStyle=IconOnly -- --[Profile][Toolbar locationToolBar] --Index=2 --ToolButtonStyle=IconOnly -- --[Profile][Toolbar mainToolBar] --Index=0 -- --[Profile][Toolbar speechToolbar] --Hidden=true --Index=5 --ToolButtonStyle=TextUnderIcon -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing 2011-03-17 15:07:57.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/konqueror/profiles/webbrowsing 2013-07-31 16:42:50.642075830 +0200 -@@ -4,5 +4,5 @@ - RootItem=View0 - View0_ServiceName=khtml - View0_ServiceType=text/html --View0_URL=http://start.fedoraproject.org/ -+View0_URL=file:///usr/share/doc/HTML/index.html - Width=80% -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js 2011-10-15 19:39:39.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/init/00-defaultLayout.js 1970-01-01 01:00:00.000000000 +0100 -@@ -1,59 +0,0 @@ --loadTemplate("org.kde.plasma-desktop.defaultPanel") -- --function noDisplayEvents(widget, containment) --{ -- widget.writeConfig("displayEvents", false); --} -- --var findWidgetsTemplate = loadTemplate("org.kde.plasma-desktop.findWidgets"); --findWidgetsTemplate.findWidgets("digital-clock", noDisplayEvents); -- --function widgetExists(name) --{ -- var widgets = knownWidgetTypes; -- for (i in widgets) { -- if (widgets[i] == name) { -- return true; -- } -- } -- -- return false; --} -- --var topLeftScreen = 0 --var rect = screenGeometry(0) -- --// find our "top left" screen to put the folderview on it --for (var i = 1; i < screenCount; ++i) { -- var g = screenGeometry(i) -- -- if (g.x <= rect.x && g.top >= rect.top) { -- rect = g -- topLeftScreen = i -- } --} -- --var hasFolderview = widgetExists("folderview"); -- --for (var i = 0; i < screenCount; ++i) { -- var desktop = new Activity -- desktop.name = i18n("Desktop") -- desktop.screen = i -- desktop.wallpaperPlugin = 'image' -- desktop.wallpaperMode = 'SingleImage' -- -- if (hasFolderview && i == topLeftScreen) { -- var folderview = desktop.addWidget("folderview") -- folderview.writeConfig("url", "desktop:/") -- } -- -- //Create more panels for other screens -- if (i > 0){ -- var panel = new Panel -- panel.screen = i -- panel.location = 'bottom' -- panel.height = panels()[i].height = screenGeometry(0).height > 1024 ? 35 : 27 -- var tasks = panel.addWidget("tasks") -- tasks.writeConfig("showOnlyCurrentScreen", true); -- } --} -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js 2010-10-09 21:00:10.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde-fedora-2.js 1970-01-01 01:00:00.000000000 +0100 -@@ -1,47 +0,0 @@ --/* -- 00-start-here-kde-fedora.js - Set launcher icon to start-here-kde-fedora -- Copyright (C) 2010 Kevin Kofler -- Copyright (C) 2010 Rex Dieter -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- -- Portions lifted from 01-kubuntu-10.04.js: -- Harald Sitter, apachelogger@ubuntu.com 2010-04-02 -- Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 -- Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later --*/ -- --launcherFound = false; -- --pids = panelIds; --for (i = 0; i < pids.length; ++i) { -- p = panelById(pids[i]); -- if (!p) continue; -- ids = p.widgetIds; -- for (j = 0; j < ids.length; ++j) { -- w = p.widgetById(ids[j]); -- if (!w || (w.type != "launcher" && w.type != "simplelauncher")) continue; -- launcherFound = true; -- if ( w.readConfig("icon", "start-here-kde") == "start-here-kde" || -- w.readConfig("icon", "start-here-kde") == "start-here" ) { -- w.writeConfig("icon", "start-here-kde-fedora"); -- } -- break; -- } -- if (launcherFound) break; --} --if (!launcherFound) -- print("No launcher found"); -- -- -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js 1970-01-01 01:00:00.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/apps/plasma-desktop/updates/00-start-here-kde.js 2013-07-31 20:48:58.788421067 +0200 -@@ -0,0 +1,50 @@ -+/* -+ 00-start-here-kde.js - Set launcher icon to start-here-kde -+ Copyright (C) 2010 Kevin Kofler -+ Copyright (C) 2010 Rex Dieter -+ Copyright (C) 2013 Than Ngo -+ -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation, either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . -+ -+ Portions lifted from 01-kubuntu-10.04.js: -+ Harald Sitter, apachelogger@ubuntu.com 2010-04-02 -+ Jonathan Riddell, jriddell@ubuntu.com 2010-02-18 -+ Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later -+ -+ Modified for rhel 2013-07-30 -+*/ -+ -+launcherFound = false; -+ -+pids = panelIds; -+for (i = 0; i < pids.length; ++i) { -+ p = panelById(pids[i]); -+ if (!p) continue; -+ ids = p.widgetIds; -+ for (j = 0; j < ids.length; ++j) { -+ w = p.widgetById(ids[j]); -+ if (!w || (w.type != "launcher" && w.type != "simplelauncher")) continue; -+ launcherFound = true; -+ if ( w.readConfig("icon", "start-here-kde") == "start-here-kde" || -+ w.readConfig("icon", "start-here-kde") == "start-here" ) { -+ w.writeConfig("icon", "system-logo-icon"); -+ } -+ break; -+ } -+ if (launcherFound) break; -+} -+if (!launcherFound) -+ print("No launcher found"); -+ -+ -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals 2010-09-03 16:30:38.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kdeglobals 2013-07-31 20:53:51.498410604 +0200 -@@ -8,16 +8,17 @@ - font=Sans Serif,10,-1,5,50,0,0,0,0,0 - menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0 - smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0 -+taskbarFont=Sans Serif,9,-1,5,50,0,0,0,0,0 - toolBarFont=Sans Serif,10,-1,5,50,0,0,0,0,0 - widgetStyle=oxygen - XftAntialias=true - - [WM] --activeFont=Sans Serif,9,-1,5,50,0,0,0,0,0 -+activeFont=Sans Serif,9,-1,5,75,0,0,0,0,0 - - [Icons] - # See http://bugzilla.redhat.com/615621 (Inherits=oxygen gone bad) --#Theme=Fedora-KDE -+#Theme=oxygen - - [KSpell] - KSpell_Client=4 -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc 2013-05-22 15:14:41.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konquerorrc 2013-07-31 16:42:50.643075830 +0200 -@@ -24,4 +24,4 @@ - WordWrapText=true - - [UserSettings] --HomeURL=http://start.fedoraproject.org/ -+HomeURL=file:///usr/share/doc/HTML/index.html -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konversationrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konversationrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/konversationrc 2009-09-08 17:16:56.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/konversationrc 2013-07-31 16:42:50.643075830 +0200 -@@ -1,13 +1,7 @@ - [Channel 0] --Name=#fedora -- --[Channel 1] --Name=#fedora-kde -- --[Channel 2] - Name=#kde - --[Channel 3] -+[Channel 1] - Name=#konversation - - [Server 0] -@@ -17,7 +11,7 @@ - - [ServerGroup 0] - AutoConnect=false --AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3 -+AutoJoinChannels=Channel 0,Channel 1 - EnableNotifications=true - Expanded=false - Name=Freenode -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc 2013-03-28 17:24:28.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc 2013-07-31 16:42:50.643075830 +0200 -@@ -1,2 +1,2 @@ - [KSplash] --Theme=SchroedingerCat -\ Kein Zeilenumbruch am Dateiende. -+Theme=RHEL7 -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kwinrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kwinrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/kwinrc 2012-01-16 21:38:21.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/kwinrc 2013-07-31 20:55:10.385407784 +0200 -@@ -1,6 +1,13 @@ - [Style] - PluginLib=kwin3_oxygen --ShowToolTips=true -+ShowToolTips=false -+BorderSize=1 -+ButtonsOnLeft= -+ButtonsOnRight=IA_X -+CustomButtonPositions=true -+ -+[Compositing] -+Enabled=false - - [Windows] - AutoRaise=off -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc 2009-12-24 03:14:26.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/nepomukserverrc 2013-07-31 21:06:05.855384354 +0200 -@@ -1,5 +1,5 @@ - [Basic Settings] --Start Nepomuk=true -+Start Nepomuk=false - - [Service-nepomukstrigiservice] --autostart=true -+autostart=false -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc 1970-01-01 01:00:00.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/oxygenrc 2013-07-31 20:55:45.761406519 +0200 -@@ -0,0 +1,3 @@ -+[Windeco] -+FrameBorder=No Side Border -+UseOxygenShadows=false -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/plasmarc kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/default/share/config/plasmarc 2013-03-28 17:24:28.000000000 +0100 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc 2013-07-31 16:42:50.643075830 +0200 -@@ -1,5 +1,2 @@ - [Theme] --name=Schroedinger_Cat -- --[Theme-plasma-netbook] --name=Schroedinger_Cat-netbook -+name=RHEL7 -diff -Nur kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js kde-settings-19-23/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js ---- kde-settings-19-23.orig/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js 2012-09-24 18:22:21.000000000 +0200 -+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/minimal/share/apps/plasma-desktop/init/00-defaultLayout.js 1970-01-01 01:00:00.000000000 +0100 -@@ -1,62 +0,0 @@ --loadTemplate("org.kde.plasma-desktop.defaultPanel") -- --function noDisplayEvents(widget, containment) --{ -- widget.writeConfig("displayEvents", false); --} -- --var findWidgetsTemplate = loadTemplate("org.kde.plasma-desktop.findWidgets"); --findWidgetsTemplate.findWidgets("digital-clock", noDisplayEvents); -- --function widgetExists(name) --{ -- var widgets = knownWidgetTypes; -- for (i in widgets) { -- if (widgets[i] == name) { -- return true; -- } -- } -- -- return false; --} -- --for (var i = 0; i < screenCount; ++i) { -- var desktop = new Activity -- desktop.name = i18n("Desktop") -- desktop.screen = i -- desktop.wallpaperPlugin = 'image' -- desktop.wallpaperMode = 'SingleImage' -- -- //Create more panels for other screens -- if (i > 0){ -- var panel = new Panel -- panel.screen = i -- panel.location = 'bottom' -- panel.height = panels()[i].height = screenGeometry(0).height > 1024 ? 35 : 27 -- var tasks = panel.addWidget("tasks") -- tasks.writeConfig("showOnlyCurrentScreen", true); -- } -- --} -- --// Replace existing launcher with simplelauncher -- --var pids = panelIds; -- --for (var i = 0; i < pids.length; ++i) { -- var p = panelById(pids[i]); -- if (!p) continue; -- var ids = p.widgetIds; -- -- for (var j = 0; j < ids.length; ++j) { -- var w = p.widgetById(ids[j]); -- if (!w || w.type != "launcher") continue; -- -- w.remove(); -- var launcher = p.addWidget("simplelauncher"); -- launcher.index = 0; -- launcher.writeConfig("icon", "start-here-kde-fedora"); -- break; -- } -- --} -diff -Nur kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules kde-settings-19-23/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules ---- kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules 2012-10-12 18:19:06.000000000 +0200 -+++ kde-settings-19-23/usr/share/polkit-1/rules.d/11-fedora-kde-policy.rules 1970-01-01 01:00:00.000000000 +0100 -@@ -1,13 +0,0 @@ --// kde-settings authorizations/policy for the wheel group. --// --// DO NOT EDIT THIS FILE, it will be overwritten on update. --// --// Allow users in the wheel group to do set the clock in kcm_clock without being --// interrupted by a password dialog -- --polkit.addRule(function(action, subject) { -- if (action.id == "org.kde.kcontrol.kcmclock.save" && -- subject.isInGroup("wheel") && subject.active) { -- return polkit.Result.YES; -- } --}); -diff -Nur kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-kde-policy.rules kde-settings-19-23/usr/share/polkit-1/rules.d/11-kde-policy.rules ---- kde-settings-19-23.orig/usr/share/polkit-1/rules.d/11-kde-policy.rules 1970-01-01 01:00:00.000000000 +0100 -+++ kde-settings-19-23/usr/share/polkit-1/rules.d/11-kde-policy.rules 2013-07-31 16:42:50.644075830 +0200 -@@ -0,0 +1,13 @@ -+// kde-settings authorizations/policy for the wheel group. -+// -+// DO NOT EDIT THIS FILE, it will be overwritten on update. -+// -+// Allow users in the wheel group to do set the clock in kcm_clock without being -+// interrupted by a password dialog -+ -+polkit.addRule(function(action, subject) { -+ if (action.id == "org.kde.kcontrol.kcmclock.save" && -+ subject.isInGroup("wheel") && subject.active) { -+ return polkit.Result.YES; -+ } -+}); diff --git a/SPECS/kde-settings.spec b/SPECS/kde-settings.spec index 5119574..925f767 100644 --- a/SPECS/kde-settings.spec +++ b/SPECS/kde-settings.spec @@ -10,7 +10,7 @@ License: MIT Url: http://fedorahosted.org/kde-settings Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.xz Source1: COPYING -Patch0: kde-settings-19-23-rhel.patch +Patch0: kde-settings-19-23-centos.patch Patch1: kde-settings-19-23-bz#1124472.patch BuildArch: noarch