[kde-workspace] 4.8.2
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Mar 30 11:57:49 UTC 2012
commit f41e1920620d5da3993c3a23817196fb3f25824f
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Fri Mar 30 13:57:24 2012 +0200
4.8.2
.gitignore | 2 +-
kde-workspace-4.8.1-settings_style.patch | 19 -----
...ch => kde-workspace-4.8.2-bz#732830-login.patch | 83 ++++++++++----------
kde-workspace.spec | 12 ++--
sources | 2 +-
5 files changed, 50 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bde810c..f9dbf0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kde-workspace-4.8.1.tar.xz
+/kde-workspace-4.8.2.tar.xz
diff --git a/kde-workspace-4.7.80-bz#732830-login.patch b/kde-workspace-4.8.2-bz#732830-login.patch
similarity index 80%
rename from kde-workspace-4.7.80-bz#732830-login.patch
rename to kde-workspace-4.8.2-bz#732830-login.patch
index 9677fbc..c930a01 100644
--- a/kde-workspace-4.7.80-bz#732830-login.patch
+++ b/kde-workspace-4.8.2-bz#732830-login.patch
@@ -1,6 +1,6 @@
-diff -up kde-workspace-4.7.80/kdm/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/CMakeLists.txt
---- kde-workspace-4.7.80/kdm/CMakeLists.txt.bz#732830-login 2011-07-27 20:35:39.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/CMakeLists.txt 2011-11-21 15:21:33.213614317 +0100
+diff -up kde-workspace-4.8.2/kdm/CMakeLists.txt.bz#732830-login kde-workspace-4.8.2/kdm/CMakeLists.txt
+--- kde-workspace-4.8.2/kdm/CMakeLists.txt.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/CMakeLists.txt 2012-03-30 13:38:35.094493727 +0200
@@ -33,6 +33,11 @@ set(backgroundlib_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/kcm/background/bgsettings.cpp
)
@@ -13,10 +13,10 @@ diff -up kde-workspace-4.7.80/kdm/CMakeLists.txt.bz#732830-login kde-workspace-4
# after confci is defined
add_subdirectory(backend)
add_subdirectory(kfrontend)
-diff -up kde-workspace-4.7.80/kdm/config.def.bz#732830-login kde-workspace-4.7.80/kdm/config.def
---- kde-workspace-4.7.80/kdm/config.def.bz#732830-login 2011-07-27 20:35:39.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/config.def 2011-11-21 15:21:33.214614320 +0100
-@@ -2287,9 +2287,13 @@ Instance: #*/
+diff -up kde-workspace-4.8.2/kdm/config.def.bz#732830-login kde-workspace-4.8.2/kdm/config.def
+--- kde-workspace-4.8.2/kdm/config.def.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/config.def 2012-03-30 13:38:35.112493501 +0200
+@@ -2288,9 +2288,13 @@ Instance: #*/
Update: upd_minshowuid
Comment:
Special case of HiddenUsers: users with a non-zero UID less than this number
@@ -32,7 +32,7 @@ diff -up kde-workspace-4.7.80/kdm/config.def.bz#732830-login kde-workspace-4.7.8
Key: MaxShowUID
Type: int
-@@ -2300,9 +2304,11 @@ Instance: #*/
+@@ -2301,9 +2305,11 @@ Instance: #*/
Update: upd_maxshowuid
Comment:
Complement to MinShowUID: users with a UID greater than this number will
@@ -46,9 +46,9 @@ diff -up kde-workspace-4.7.80/kdm/config.def.bz#732830-login kde-workspace-4.7.8
Key: SortUsers
Type: bool
-diff -up kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt
---- kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt.bz#732830-login 2011-07-27 20:35:39.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt 2011-11-21 15:21:33.226614347 +0100
+diff -up kde-workspace-4.8.2/kdm/kcm/CMakeLists.txt.bz#732830-login kde-workspace-4.8.2/kdm/kcm/CMakeLists.txt
+--- kde-workspace-4.8.2/kdm/kcm/CMakeLists.txt.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kcm/CMakeLists.txt 2012-03-30 13:38:35.114493477 +0200
@@ -15,6 +15,7 @@ kde4_add_ui_files(kcmbackgroundlib_SRCS
background/bgadvanced_ui.ui)
@@ -57,9 +57,9 @@ diff -up kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt.bz#732830-login kde-workspa
background.cpp
kdm-gen.cpp
kdm-dlg.cpp
-diff -up kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp
---- kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp.bz#732830-login 2011-08-22 15:29:50.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp 2011-11-21 15:21:33.248614403 +0100
+diff -up kde-workspace-4.8.2/kdm/kcm/kdm-users.cpp.bz#732830-login kde-workspace-4.8.2/kdm/kcm/kdm-users.cpp
+--- kde-workspace-4.8.2/kdm/kcm/kdm-users.cpp.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kcm/kdm-users.cpp 2012-03-30 13:38:35.123493365 +0200
@@ -58,6 +58,9 @@
#include <unistd.h>
#include <pwd.h>
@@ -104,9 +104,9 @@ diff -up kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp.bz#732830-login kde-workspac
m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir",
QString(KStandardDirs::installPath("data") + "kdm/faces" + '/'));
-diff -up kde-workspace-4.7.80/kdm/kcm/main.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kcm/main.cpp
---- kde-workspace-4.7.80/kdm/kcm/main.cpp.bz#732830-login 2011-08-22 15:29:50.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kcm/main.cpp 2011-11-21 15:21:33.249614402 +0100
+diff -up kde-workspace-4.8.2/kdm/kcm/main.cpp.bz#732830-login kde-workspace-4.8.2/kdm/kcm/main.cpp
+--- kde-workspace-4.8.2/kdm/kcm/main.cpp.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kcm/main.cpp 2012-03-30 13:38:35.135493214 +0200
@@ -59,6 +59,7 @@
#include <pwd.h>
#include <grp.h>
@@ -162,9 +162,9 @@ diff -up kde-workspace-4.7.80/kdm/kcm/main.cpp.bz#732830-login kde-workspace-4.7
alusers[it.key()] = uid;
for (jt = it.value().second.begin();
jt != it.value().second.end(); ++jt)
-diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.c.bz#732830-login kde-workspace-4.7.80/kdm/kdm-minmaxuid.c
---- kde-workspace-4.7.80/kdm/kdm-minmaxuid.c.bz#732830-login 2011-11-21 15:21:33.249614402 +0100
-+++ kde-workspace-4.7.80/kdm/kdm-minmaxuid.c 2011-11-21 15:21:33.249614402 +0100
+diff -up kde-workspace-4.8.2/kdm/kdm-minmaxuid.c.bz#732830-login kde-workspace-4.8.2/kdm/kdm-minmaxuid.c
+--- kde-workspace-4.8.2/kdm/kdm-minmaxuid.c.bz#732830-login 2012-03-30 13:38:35.137493189 +0200
++++ kde-workspace-4.8.2/kdm/kdm-minmaxuid.c 2012-03-30 13:38:35.137493189 +0200
@@ -0,0 +1,152 @@
+/*
+ * Utilities for handling the UID range allocated for non-system user
@@ -318,9 +318,9 @@ diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.c.bz#732830-login kde-workspace-
+ return 0;
+}
+#endif
-diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.h.bz#732830-login kde-workspace-4.7.80/kdm/kdm-minmaxuid.h
---- kde-workspace-4.7.80/kdm/kdm-minmaxuid.h.bz#732830-login 2011-11-21 15:21:33.249614402 +0100
-+++ kde-workspace-4.7.80/kdm/kdm-minmaxuid.h 2011-11-21 15:21:33.249614402 +0100
+diff -up kde-workspace-4.8.2/kdm/kdm-minmaxuid.h.bz#732830-login kde-workspace-4.8.2/kdm/kdm-minmaxuid.h
+--- kde-workspace-4.8.2/kdm/kdm-minmaxuid.h.bz#732830-login 2012-03-30 13:38:35.148493053 +0200
++++ kde-workspace-4.8.2/kdm/kdm-minmaxuid.h 2012-03-30 13:38:35.138493177 +0200
@@ -0,0 +1,25 @@
+/*
+ * Utilities for handling the UID range allocated for non-system user
@@ -347,9 +347,9 @@ diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.h.bz#732830-login kde-workspace-
+
+
+#endif
-diff -up kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt
---- kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt.bz#732830-login 2011-07-27 20:35:39.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt 2011-11-21 15:21:33.250614402 +0100
+diff -up kde-workspace-4.8.2/kdm/kfrontend/CMakeLists.txt.bz#732830-login kde-workspace-4.8.2/kdm/kfrontend/CMakeLists.txt
+--- kde-workspace-4.8.2/kdm/kfrontend/CMakeLists.txt.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kfrontend/CMakeLists.txt 2012-03-30 13:38:35.149493040 +0200
@@ -52,6 +52,7 @@ set(kdm_greet_SRCS
utils.cpp
utils.h
@@ -367,18 +367,19 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt.bz#732830-login kde-w
macro_add_file_dependencies(genkdmconf.c ${confci})
kde4_add_executable(genkdmconf NOGUI ${genkdmconf_SRCS})
macro_add_compile_flags(genkdmconf -U_REENTRANT)
-diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c
---- kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login 2011-07-27 20:35:39.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c 2011-11-21 15:21:33.251614401 +0100
-@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #ifdef BSD
- # include <utmp.h>
+diff -up kde-workspace-4.8.2/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-workspace-4.8.2/kdm/kfrontend/genkdmconf.c
+--- kde-workspace-4.8.2/kdm/kfrontend/genkdmconf.c.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kfrontend/genkdmconf.c 2012-03-30 13:49:49.760059248 +0200
+@@ -58,6 +58,8 @@ Foundation, Inc., 51 Franklin Street, Fi
+ # endif
#endif
-+#include "../kdm-minmaxuid.h"
++#include "../kdm-minmaxuid.h"
++
#define WANT_CONF_GEN
#include <config.ci>
-@@ -1999,7 +2000,7 @@ upd_showusers(Entry *ce, Section *cs)
+
+@@ -2008,7 +2010,7 @@ upd_showusers(Entry *ce, Section *cs)
}
}
@@ -387,7 +388,7 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-wor
static void
upd_minshowuid(Entry *ce, Section *cs ATTR_UNUSED)
-@@ -2025,16 +2026,18 @@ upd_hiddenusers(Entry *ce, Section *cs)
+@@ -2034,16 +2036,18 @@ upd_hiddenusers(Entry *ce, Section *cs)
char *nv;
const char *msu, *pt, *et;
struct passwd *pw;
@@ -409,7 +410,7 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-wor
nv = 0;
pt = ce->value;
-@@ -2048,7 +2051,7 @@ upd_hiddenusers(Entry *ce, Section *cs)
+@@ -2057,7 +2061,7 @@ upd_hiddenusers(Entry *ce, Section *cs)
}
if ((pw = getpwnam(nbuf))) {
if (!pw->pw_uid ||
@@ -418,7 +419,7 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-wor
{
if (nv)
strCat(&nv, ",%s", nbuf);
-@@ -2991,7 +2994,7 @@ int main(int argc, char **argv)
+@@ -3000,7 +3004,7 @@ int main(int argc, char **argv)
StrList *fp;
Section *cs;
Entry *ce, **cep;
@@ -427,7 +428,7 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-wor
int no_old_xdm = 0, no_old_kde = 0;
struct stat st;
-@@ -3230,27 +3233,9 @@ int main(int argc, char **argv)
+@@ -3239,27 +3243,9 @@ int main(int argc, char **argv)
}
}
}
@@ -458,9 +459,9 @@ diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-wor
for (i = 0; i <= CONF_MAX_PRIO; i++)
for (cs = config; cs; cs = cs->next)
for (ce = cs->ents; ce; ce = ce->next)
-diff -up kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp
---- kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp.bz#732830-login 2011-08-22 15:29:51.000000000 +0200
-+++ kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp 2011-11-21 15:21:33.252614402 +0100
+diff -up kde-workspace-4.8.2/kdm/kfrontend/kgreeter.cpp.bz#732830-login kde-workspace-4.8.2/kdm/kfrontend/kgreeter.cpp
+--- kde-workspace-4.8.2/kdm/kfrontend/kgreeter.cpp.bz#732830-login 2012-03-30 00:02:31.000000000 +0200
++++ kde-workspace-4.8.2/kdm/kfrontend/kgreeter.cpp 2012-03-30 13:38:35.163492865 +0200
@@ -66,6 +66,8 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <X11/Xlib.h>
#include <fixx11h.h>
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 807f9a4..edcf426 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -13,8 +13,8 @@
Summary: KDE Workspace
Name: kde-workspace
-Version: 4.8.1
-Release: 7%{?dist}
+Version: 4.8.2
+Release: 1%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -86,7 +86,7 @@ Patch26: kde-workspace-4.8.0-systray_ktp_presence.patch
Patch50: kde-workspace-4.7.80-kde#171685.patch
# use /etc/login.defs to define a 'system' account instead of hard-coding 500
-Patch52: kde-workspace-4.7.80-bz#732830-login.patch
+Patch52: kde-workspace-4.8.2-bz#732830-login.patch
# kdm overwrites ~/.Xauthority with wrong SELinux context on logout
# http://bugzilla.redhat.com/567914
@@ -109,8 +109,6 @@ Patch57: kde-workspace-4.8.0-bug796969.patch
Patch58: kde-workspace-4.8.0-systemd-shutdown.patch
## upstream patches
-# https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/a91f888dac689bd64d1ac9290769bd881af9e319
-Patch100: kde-workspace-4.8.1-settings_style.patch
## plasma active patches
# adapted version of wac-html-widgets.patch
@@ -436,7 +434,6 @@ Requires: akonadi
%patch58 -p1 -b .systemd-shutdown
# upstream patches
-%patch100 -p1 -b .settings_style
# plasma-active
%patch153 -p1 -b .wac-html-widgets
@@ -977,6 +974,9 @@ fi
%changelog
+* Fri Mar 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.2-1
+- 4.8.2
+
* Mon Mar 19 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.1-7
- rebuild for plasma4.prov fix (no more spaces in Plasma runner auto-Provides)
diff --git a/sources b/sources
index be528bf..8074004 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4549dab07507e602a868bededb740ec kde-workspace-4.8.1.tar.xz
+3744e8eea1d0e25bd8646415e193873f kde-workspace-4.8.2.tar.xz
More information about the scm-commits
mailing list