diff --git a/SOURCES/kde-workspace-4.10.5-bz#1063302-branding.patch b/SOURCES/kde-workspace-4.10.5-bz#1063302-branding.patch new file mode 100644 index 0000000..57101db --- /dev/null +++ b/SOURCES/kde-workspace-4.10.5-bz#1063302-branding.patch @@ -0,0 +1,33 @@ +diff -up kde-workspace-4.10.5/plasma/desktop/applets/kickoff/applet/applet.cpp.than kde-workspace-4.10.5/plasma/desktop/applets/kickoff/applet/applet.cpp +--- kde-workspace-4.10.5/plasma/desktop/applets/kickoff/applet/applet.cpp.than 2014-02-18 20:48:13.688843863 +0100 ++++ kde-workspace-4.10.5/plasma/desktop/applets/kickoff/applet/applet.cpp 2014-02-18 20:49:46.920845262 +0100 +@@ -191,7 +191,7 @@ void LauncherApplet::toolTipAboutToShow( + void LauncherApplet::configChanged() + { + KConfigGroup cg = config(); +- setPopupIcon(cg.readEntry("icon", "start-here-kde")); ++ setPopupIcon(cg.readEntry("icon", "system-logo-icon")); + constraintsEvent(Plasma::ImmutableConstraint); + + if (d->launcher) { +@@ -210,7 +210,7 @@ void LauncherApplet::configAccepted() + d->createLauncher(); + + KConfigGroup cg = config(); +- const QString oldIcon = cg.readEntry("icon", "start-here-kde"); ++ const QString oldIcon = cg.readEntry("icon", "system-logo-icon"); + if (!iconname.isEmpty() && iconname != oldIcon) { + cg.writeEntry("icon", iconname); + +diff -up kde-workspace-4.10.5/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.than kde-workspace-4.10.5/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +--- kde-workspace-4.10.5/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.than 2014-02-18 20:51:12.709846549 +0100 ++++ kde-workspace-4.10.5/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2014-02-18 20:52:09.046847394 +0100 +@@ -307,7 +307,7 @@ MenuLauncherApplet::MenuLauncherApplet(Q + d->viewtypes << "RunCommand"; + } + d->viewtypes << "Leave"; +- d->iconname = "start-here-kde"; ++ d->iconname = "system-logo-icon"; + } + } + d->formattype = NameDescription; diff --git a/SOURCES/kde-workspace-4.10.5-coverity-scan.patch b/SOURCES/kde-workspace-4.10.5-coverity-scan.patch new file mode 100644 index 0000000..bc7de8d --- /dev/null +++ b/SOURCES/kde-workspace-4.10.5-coverity-scan.patch @@ -0,0 +1,34 @@ +diff --git a/kcontrol/desktoptheme/desktopthemedetails.cpp b/kcontrol/desktoptheme/desktopthemedetails.cpp +index 295edd9..ce01680 100644 +--- a/kcontrol/desktoptheme/desktopthemedetails.cpp ++++ b/kcontrol/desktoptheme/desktopthemedetails.cpp +@@ -287,9 +287,10 @@ void DesktopThemeDetails::exportTheme() + if (!expFileName.isEmpty()) { + KUrl path(themePath); + KZip expFile(expFileName); +- expFile.open(QIODevice::WriteOnly); +- expFile.addLocalDirectory(path.directory (), themeStoragePath); +- expFile.close(); ++ if (expFile.open(QIODevice::WriteOnly)) { ++ expFile.addLocalDirectory(path.directory (), themeStoragePath); ++ expFile.close(); ++ } + } + } + } +diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp +index 6e9a261..668c48a 100644 +--- a/ksysguard/gui/Workspace.cpp ++++ b/ksysguard/gui/Workspace.cpp +@@ -198,7 +198,9 @@ void Workspace::importWorkSheet( const KUrl &url ) + * transparent. Unless s/o beats me up I use this pseudo transparent + * code. */ + QString tmpFile; +- KIO::NetAccess::download( url, tmpFile, this ); ++ if (!KIO::NetAccess::download( url, tmpFile, this )) { ++ return; ++ } + + // Import sheet from file. + if ( !restoreWorkSheet( tmpFile ) ) + diff --git a/SOURCES/kde-workspace-4.10.5-rhbz990146.patch b/SOURCES/kde-workspace-4.10.5-rhbz990146.patch new file mode 100644 index 0000000..de850c4 --- /dev/null +++ b/SOURCES/kde-workspace-4.10.5-rhbz990146.patch @@ -0,0 +1,112 @@ +diff -ur kde-workspace-orig/kcontrol/dateandtime/dtime.cpp kde-workspace-4.10.5/kcontrol/dateandtime/dtime.cpp +--- kde-workspace-orig/kcontrol/dateandtime/dtime.cpp 2013-06-28 19:10:45.000000000 +0200 ++++ kde-workspace-4.10.5/kcontrol/dateandtime/dtime.cpp 2013-12-05 23:59:09.833603024 +0100 +@@ -210,6 +210,7 @@ + + // read the currently set time zone + tzonelist->setSelected(KSystemTimeZones::local().name(), true); ++ emit timeChanged(false); + } + + void Dtime::save( QVariantMap& helperargs ) +@@ -253,12 +254,11 @@ + + QStringList selectedZones(tzonelist->selection()); + +- if (selectedZones.count() > 0) { +- QString selectedzone(selectedZones[0]); ++ if (!selectedZones.isEmpty()) { + helperargs["tz"] = true; +- helperargs["tzone"] = selectedzone; ++ helperargs["tzone"] = selectedZones.first(); + } else { +- helperargs["tzreset"] = true; // // make the helper reset the timezone ++ helperargs["tzreset"] = true; // make the helper reset the timezone + } + + currentZone(); +Pouze v kde-workspace-4.10.5/kcontrol/dateandtime: dtime.cpp.orig +diff -ur kde-workspace-orig/kcontrol/dateandtime/helper.cpp kde-workspace-4.10.5/kcontrol/dateandtime/helper.cpp +--- kde-workspace-orig/kcontrol/dateandtime/helper.cpp 2013-06-28 19:10:44.000000000 +0200 ++++ kde-workspace-4.10.5/kcontrol/dateandtime/helper.cpp 2013-12-05 23:59:09.834603030 +0100 +@@ -175,30 +175,32 @@ + + QString val = selectedzone; + #else +- QString tz = "/usr/share/zoneinfo/" + selectedzone; ++ QString tz = "/usr/share/zoneinfo/" + selectedzone; + +- QString zic = KStandardDirs::findExe("zic", exePath); +- if (!zic.isEmpty()) { +- KProcess::execute(zic, QStringList() << "-l" << selectedzone); +- } else if (!QFile::remove("/etc/localtime")) { +- ret |= TimezoneError; +- } else if (!QFile::copy(tz, "/etc/localtime")) { +- ret |= TimezoneError; +- } +- +- QFile fTimezoneFile("/etc/timezone"); +- +- if (fTimezoneFile.exists() && fTimezoneFile.open(QIODevice::WriteOnly | QIODevice::Truncate) ) { +- QTextStream t(&fTimezoneFile); +- t << selectedzone; +- fTimezoneFile.close(); +- } ++ if (QFile::exists(tz)) { // make sure the new TZ really exists ++ QFile::remove("/etc/localtime"); ++ } else { ++ return TimezoneError; ++ } ++ ++ if (!QFile::link(tz, "/etc/localtime")) { // fail if we can't setup the new timezone ++ return TimezoneError; ++ } ++ ++ QFile fTimezoneFile("/etc/timezone"); ++ ++ if (fTimezoneFile.exists() && fTimezoneFile.open(QIODevice::WriteOnly | QIODevice::Truncate) ) { ++ QTextStream t(&fTimezoneFile); ++ t << selectedzone; ++ fTimezoneFile.close(); ++ } + +- QString val = ':' + tz; + #endif // !USE_SOLARIS + +- setenv("TZ", val.toAscii(), 1); +- tzset(); ++ QString val = ':' + selectedzone; ++ ++ setenv("TZ", val.toUtf8(), 1); ++ tzset(); + + return ret; + } +@@ -206,11 +208,11 @@ + int ClockHelper::tzreset() + { + #if !defined(USE_SOLARIS) // Do not update the System! +- unlink( "/etc/timezone" ); +- unlink( "/etc/localtime" ); ++ unlink( "/etc/timezone" ); ++ unlink( "/etc/localtime" ); + +- setenv("TZ", "", 1); +- tzset(); ++ setenv("TZ", "", 1); ++ tzset(); + #endif // !USE SOLARIS + return 0; + } +diff -ur kde-workspace-orig/kcontrol/dateandtime/main.cpp kde-workspace-4.10.5/kcontrol/dateandtime/main.cpp +--- kde-workspace-orig/kcontrol/dateandtime/main.cpp 2013-06-28 19:10:44.000000000 +0200 ++++ kde-workspace-4.10.5/kcontrol/dateandtime/main.cpp 2013-12-05 23:59:09.834603030 +0100 +@@ -95,7 +95,7 @@ + + if (reply.failed()) { + if (reply.type() == ActionReply::KAuthError) { +- KMessageBox::error(this, i18n("Unable to authenticate/execute the action: %1, %2", reply.errorCode(), reply.errorDescription())); ++ KMessageBox::error(this, i18n("Unable to authenticate/execute the action: %1, %2", reply.errorCode(), reply.errorDescription())); + } else { + dtime->processHelperErrors(reply.errorCode()); + } diff --git a/SOURCES/kde-workspace-bz#1067111-panel-placing.patch b/SOURCES/kde-workspace-bz#1067111-panel-placing.patch new file mode 100644 index 0000000..150d4e0 --- /dev/null +++ b/SOURCES/kde-workspace-bz#1067111-panel-placing.patch @@ -0,0 +1,54 @@ +diff --git a/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js +index 47f635c..9d857a2 100644 +--- a/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js ++++ b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js +@@ -1,7 +1,28 @@ + var panel = new Panel +-if (panelIds.length == 1) { +- // we are the only panel, so set the location for the user +- panel.location = 'bottom' ++var panelScreen = panel.screen ++var freeEdges = {"bottom": true, "top": true, "left": true, "right": true} ++ ++for (i = 0; i < panelIds.length; ++i) { ++ var tmpPanel = panelById(panelIds[i]) ++ if (tmpPanel.screen == panelScreen) { ++ // Ignore the new panel ++ if (tmpPanel.id != panel.id) { ++ freeEdges[tmpPanel.location] = false; ++ } ++ } ++} ++ ++if (freeEdges["bottom"] == true) { ++ panel.location = "bottom"; ++} else if (freeEdges["top"] == true) { ++ panel.location = "top"; ++} else if (freeEdges["left"] == true) { ++ panel.location = "left"; ++} else if (freeEdges["right"] == true) { ++ panel.location = "right"; ++} else { ++ // There is no free edge, so leave the default value ++ panel.location = "top"; + } + + panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27 +diff --git a/plasma/desktop/shell/desktopcorona.cpp b/plasma/desktop/shell/desktopcorona.cpp +index 4c2483d..2f05dfc 100644 +--- a/plasma/desktop/shell/desktopcorona.cpp ++++ b/plasma/desktop/shell/desktopcorona.cpp +@@ -534,10 +534,10 @@ void DesktopCorona::addPanel(const QString &plugin) + QList freeEdges = DesktopCorona::freeEdges(screen); + //kDebug() << freeEdges; + Plasma::Location destination; +- if (freeEdges.contains(Plasma::TopEdge)) { +- destination = Plasma::TopEdge; +- } else if (freeEdges.contains(Plasma::BottomEdge)) { ++ if (freeEdges.contains(Plasma::BottomEdge)) { + destination = Plasma::BottomEdge; ++ } else if (freeEdges.contains(Plasma::TopEdge)) { ++ destination = Plasma::TopEdge; + } else if (freeEdges.contains(Plasma::LeftEdge)) { + destination = Plasma::LeftEdge; + } else if (freeEdges.contains(Plasma::RightEdge)) { diff --git a/SOURCES/kde-workspace-exclude_kdm.patch b/SOURCES/kde-workspace-exclude_kdm.patch new file mode 100644 index 0000000..4c15ad9 --- /dev/null +++ b/SOURCES/kde-workspace-exclude_kdm.patch @@ -0,0 +1,51 @@ +diff -up kde-workspace-4.10.5/CMakeLists.txt.than kde-workspace-4.10.5/CMakeLists.txt +--- kde-workspace-4.10.5/CMakeLists.txt.than 2014-02-27 12:11:28.649545493 +0100 ++++ kde-workspace-4.10.5/CMakeLists.txt 2014-02-27 12:22:15.503547119 +0100 +@@ -176,11 +176,6 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Des + macro_optional_add_subdirectory(appmenu) + endif(NOT WIN32) + +- if(X11_Xau_FOUND AND X11_Xdmcp_FOUND) +- macro_optional_add_subdirectory( kdm ) +- else(X11_Xau_FOUND AND X11_Xdmcp_FOUND) +- message(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile") +- endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND) + endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") + + if(NOT WIN32) +diff -up kde-workspace-4.10.5/doc/CMakeLists.txt.than kde-workspace-4.10.5/doc/CMakeLists.txt +--- kde-workspace-4.10.5/doc/CMakeLists.txt.than 2014-02-27 12:22:56.089547221 +0100 ++++ kde-workspace-4.10.5/doc/CMakeLists.txt 2014-02-27 12:23:05.400547245 +0100 +@@ -1,4 +1,3 @@ +-add_subdirectory(kdm) + add_subdirectory(klipper) + add_subdirectory(kfontview) + add_subdirectory(kmenuedit) +diff -up kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma.desktop.cmake.than kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma.desktop.cmake +--- kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma.desktop.cmake.than 2014-02-28 14:37:00.969067779 +0100 ++++ kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma.desktop.cmake 2014-02-28 14:37:46.899068843 +0100 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=${BIN_INSTALL_DIR}/startkde +-TryExec=${BIN_INSTALL_DIR}/startkde ++Exec=/usr/bin/startkde ++TryExec=/usr/bin/startkde + Name=KDE Plasma Workspace + Name[ar]=مساحة عمل بلازما كدي + Name[bg]=Работно пространство Plasma на KDE +diff -up kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake.than kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake +--- kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake.than 2014-02-28 14:40:48.322073046 +0100 ++++ kde-workspace-4.10.5/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake 2014-02-28 14:38:09.762069373 +0100 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Encoding=UTF-8 + Type=XSession +-Exec=${BIN_INSTALL_DIR}/startkde --failsafe +-TryExec=${BIN_INSTALL_DIR}/startkde ++Exec=/usr/bin/startkde --failsafe ++TryExec=/usr/bin/startkde + Name=KDE Plasma Workspace (failsafe session) + Name[ar]=مساحة عمل بلازما كدي (الجلسة الآمنة) + Name[bn]=কে.ডি.ই. প্লাসমা ওয়ার্কস্পেস (failsafe session) diff --git a/SPECS/kde-workspace.spec b/SPECS/kde-workspace.spec index c5e53b4..62afe46 100644 --- a/SPECS/kde-workspace.spec +++ b/SPECS/kde-workspace.spec @@ -10,7 +10,7 @@ Summary: KDE Workspace Name: kde-workspace Version: 4.10.5 -Release: 7%{?dist} +Release: 17%{?dist} License: GPLv2 URL: https://projects.kde.org/projects/kde/kde-workspace %global revision %(echo %{version} | cut -d. -f3) @@ -113,6 +113,12 @@ Patch57: kde-workspace-4.8.0-bug796969.patch # contains a small hack, to be fixed properly soon Patch62: kde-workspace-4.10.2-systemd-displaymanager.patch +# add a new panel to bottom by default +Patch63: kde-workspace-bz#1067111-panel-placing.patch + +# fix some warnings from coverity scan +Patch64: kde-workspace-4.10.5-coverity-scan.patch + ## upstream patches Patch100: kde-workspace-4.11-bz#921781-check-max-viewport-size.patch Patch101: kde-workspace-4.10-bz#921742.patch @@ -120,6 +126,7 @@ Patch102: kde-workspace-4.10.5-CVE-2013-4132.patch Patch103: kde-workspace-4.10.5-CVE-2013-4133.patch Patch104: kde-workspace-4.10.x-bz#1001708.patch Patch105: kde-workspace-4.10.x-bz#1001727.patch +Patch106: kde-workspace-4.10.5-rhbz990146.patch ## plasma active patches @@ -130,6 +137,8 @@ Patch210: kdebase-workspace-4.5.90-no_HAL2.patch # rhel patches Patch300: kde-workspace-4.8.3-webkit.patch +Patch301: kde-workspace-4.10.5-bz#1063302-branding.patch +Patch302: kde-workspace-exclude_kdm.patch ## trunk patches @@ -467,6 +476,8 @@ Requires: akonadi %patch55 -p1 -b .BUILD_KCM_RANDR %patch57 -p1 -b .bug796969 %patch62 -p1 -b .systemd-displaymanager +%patch63 -p1 -b .panel-placing +%patch64 -p1 -b .coverity-scan # upstream patches %patch100 -p1 -b .bug921781 @@ -475,6 +486,7 @@ Requires: akonadi %patch103 -p1 -b .CVE-2013-4133 %patch104 -p1 -b .bz#1001708 %patch105 -p1 -b .bz#1001727 +%patch106 -p1 -b .bz#990146 # Fedora patches %if 0%{?fedora} && 0%{?rhel} > 6 @@ -486,6 +498,10 @@ Requires: akonadi %if ! 0%{?webkit} %patch300 -p1 -b .webkit %endif +%patch301 -p1 -b .branding +%if ! 0%{?kdm} +%patch302 -p1 -b .bz#1070140 +%endif # trunk patches @@ -515,6 +531,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # xsession support mkdir -p %{buildroot}%{_datadir}/xsessions/ + +%if 0%{?kdm} mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde-plasma.desktop \ %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde-plasma-safe.desktop \ %{buildroot}%{_datadir}/xsessions/ @@ -530,6 +548,10 @@ mkdir -p %{buildroot}%{_kde4_appsdir}/kdm/faces pushd %{buildroot}%{_kde4_appsdir}/kdm/faces ln -sf ../pics/users/%{default_face_icon} .default.face.icon popd +%else +install -p -m644 kdm/kfrontend/sessions/kde-plasma.desktop.cmake %{buildroot}%{_datadir}/xsessions/kde-plasma.desktop +install -p -m644 kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake %{buildroot}%{_datadir}/xsessions/kde-plasma-safe.desktop +%endif # unpackaged files rm -rfv %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Default/ @@ -537,12 +559,14 @@ rm -rfv %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Default/ # fix documentation multilib conflict in index.cache for f in kcontrol/colors kmenuedit kcontrol/windowbehaviour kcontrol/kwindecoration \ kcontrol/khotkeys kdm ksysguard ; do - bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 - sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - sed -i -e 's!href="#ftn.id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - sed -i -e 's!id="ftn.id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache - bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + if [ -f %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 ] ; then + bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 + sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + sed -i -e 's!href="#ftn.id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + sed -i -e 's!id="ftn.id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + fi done # install manpage @@ -656,7 +680,6 @@ fi %{_kde4_configdir}/activities.knsrc %{_kde4_configdir}/aurorae.knsrc -%{_kde4_configdir}/background.knsrc %{_kde4_configdir}/ksplash.knsrc %{_kde4_configdir}/kwineffect.knsrc %{_kde4_configdir}/kwinscripts.knsrc @@ -667,7 +690,10 @@ fi %{_kde4_configdir}/xcursor.knsrc %{_kde4_datadir}/kde4/services/* +%{_datadir}/xsessions/*.desktop +%if 0%{?kdm} %exclude %{_kde4_datadir}/kde4/services/kdm.desktop +%endif %{_kde4_datadir}/kde4/servicetypes/* %{_kde4_datadir}/sounds/pop.wav %{_kde4_datadir}/autostart/klipper.desktop @@ -677,7 +703,6 @@ fi %{_kde4_datadir}/applications/kde4/* %{_sysconfdir}/dbus-1/system.d/org.kde.fontinst.conf %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf -%{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf %{_sysconfdir}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf %{_datadir}/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml %{_datadir}/dbus-1/interfaces/org.kde.kded.appmenu.xml @@ -689,10 +714,8 @@ fi %{_datadir}/dbus-1/services/org.kde.krunner.service %{_datadir}/dbus-1/system-services/org.kde.fontinst.service %{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmclock.service -%{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service %{_datadir}/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service %{_kde4_datadir}/config.kcfg/* -%{_datadir}/xsessions/*.desktop %{_kde4_docdir}/HTML/en/kfontview/ %{_kde4_docdir}/HTML/en/kcontrol/ %exclude %{_kde4_docdir}/HTML/en/kcontrol/colors/ @@ -710,7 +733,9 @@ fi %{_kde4_libdir}/kde4/ion_*.so %{_kde4_libdir}/kde4/kcm_*.so %exclude %{_kde4_libdir}/kde4/kcm_colors.so +%if 0%{?kdm} %exclude %{_kde4_libdir}/kde4/kcm_kdm.so +%endif %{_kde4_libdir}/kde4/kded_*.so %{_kde4_libdir}/kde4/keyboard_layout_widget.so %{_kde4_libdir}/kde4/krunner_*.so @@ -744,8 +769,6 @@ fi %{_kde4_libdir}/kde4/solid_*.so %{_kde4_libexecdir}/kcheckpass %{_kde4_libexecdir}/kcmdatetimehelper -%{_kde4_libexecdir}/kcmkdmhelper -%{_kde4_libexecdir}/krootimage %{_kde4_libexecdir}/kscreenlocker_greet %{_kde4_libexecdir}/kwin_killer_helper %{_kde4_libexecdir}/kwin_opengl_test @@ -795,7 +818,6 @@ fi %{_kde4_configdir}/kfontinst.knsrc %{_polkit_qt_policydir}/org.kde.fontinst.policy %{_polkit_qt_policydir}/org.kde.kcontrol.kcmclock.policy -%{_polkit_qt_policydir}/org.kde.kcontrol.kcmkdm.policy %{_polkit_qt_policydir}/org.kde.powerdevil.backlighthelper.policy %{_kde4_appsdir}/kfontinst/ %{_kde4_appsdir}/kfontview/ @@ -893,6 +915,7 @@ fi %{_kde4_appsdir}/color-schemes/Zion.colors %{_kde4_appsdir}/color-schemes/ZionReversed.colors +%if 0%{?kdm} %files -n kdm %{_kde4_bindir}/genkdmconf %{_kde4_bindir}/kdm @@ -901,6 +924,7 @@ fi %{_kde4_libexecdir}/kdm_config %{_kde4_libexecdir}/kdm_greet %{_kde4_configdir}/kdm.knsrc +%{_kde4_configdir}/background.knsrc %{_kde4_docdir}/HTML/en/kdm/ %dir %{_kde4_appsdir}/doc %{_kde4_appsdir}/doc/kdm/ @@ -911,6 +935,11 @@ fi %{_kde4_appsdir}/kdm/programs/ %dir %{_kde4_appsdir}/kdm/themes/ %{_kde4_datadir}/kde4/services/kdm.desktop +%{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf +%{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service +%{_kde4_libexecdir}/kcmkdmhelper +%{_kde4_libexecdir}/krootimage +%{_polkit_qt_policydir}/org.kde.kcontrol.kcmkdm.policy %files -n kdm-themes %{_kde4_appsdir}/kdm/themes/ariya/ @@ -919,8 +948,8 @@ fi %{_kde4_appsdir}/kdm/themes/horos/ %{_kde4_appsdir}/kdm/themes/oxygen/ %{_kde4_appsdir}/kdm/themes/oxygen-air/ -# not sure why this is included in kdm sources... ? -- rex %{_kde4_datadir}/wallpapers/stripes.png* +%endif %files -n kgreeter-plugins %{_kde4_libdir}/kde4/kgreet_classic.so @@ -1029,6 +1058,36 @@ fi %changelog +* Thu Mar 06 2014 Jan Grulich - 4.10.5-17 +- Fix some warnings from coverity scan + +* Tue Mar 04 2014 Jan Grulich - 4.10.5-16 +- Last try to fix rhbz#1067111 + +* Sat Mar 01 2014 Jan Grulich - 4.10.5-15 +- Really resolves: rhbz#1067111 + +* Fri Feb 28 2014 Than Ngo - 4.10.5-14 +- add missing xsessions + +* Thu Feb 27 2014 Than Ngo - 4.10.5-13 +- Exclude kdm + +* Mon Feb 24 2014 Jan Grulich - 4.10.5-12 +- Resolves: rhbz#1067111 - adding second panel on second monitor places panel on top + +* Wed Feb 19 2014 Than Ngo - 4.10.5-11 +- fix branding issue + +* Fri Jan 24 2014 Daniel Mach - 4.10.5-10 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 4.10.5-9 +- Mass rebuild 2013-12-27 + +* Fri Dec 06 2013 Lukáš Tinkl - 4.10.5-8 +- Resolves: rhbz#990146 - Timezone changed to Bratislava instead of Prague + * Wed Oct 30 2013 Than Ngo - 4.10.5-7 - bz#1001708, Out of range date - bz#1001727, "RTC time" is not changed when using time server