[slim/f15] Fix consolekit issue

Pavel Zhukov landgraf at fedoraproject.org
Mon Jul 25 18:57:17 UTC 2011


commit 7654c9bc894a7e9b4a221905438edaf42aa46650
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Mon Jul 25 22:56:43 2011 +0400

    Fix consolekit issue

 slim-consolekit.patch |   10 ++++++++++
 slim-dynwm            |    8 ++++++++
 slim.spec             |   16 ++++++++++++----
 sources               |    2 --
 4 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/slim-consolekit.patch b/slim-consolekit.patch
new file mode 100644
index 0000000..b9f3acd
--- /dev/null
+++ b/slim-consolekit.patch
@@ -0,0 +1,10 @@
+--- a/app.cpp	2010-07-08 07:04:10.000000000 +0200
++++ b/app.cpp	2010-11-19 09:18:04.215918961 +0100
+@@ -236,7 +236,6 @@
+         pam.start("slim");
+         pam.set_item(PAM::Authenticator::TTY, DisplayName);
+         pam.set_item(PAM::Authenticator::Requestor, "root");
+-        pam.set_item(PAM::Authenticator::Host, "localhost");
+ 
+     }
+     catch(PAM::Exception& e){
diff --git a/slim-dynwm b/slim-dynwm
new file mode 100644
index 0000000..2a4479d
--- /dev/null
+++ b/slim-dynwm
@@ -0,0 +1,8 @@
+#!/bin/sh
+update_slim_wmlist
+if [ "x\$1" = "x-nodaemon" ]; then
+    shift
+    exec slim "\$@"
+else
+    slim -d "\$@"
+fi
diff --git a/slim.spec b/slim.spec
index 8e83a59..c2ac452 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Login Manager
 Group:          User Interface/X
 License:        GPLv2+
@@ -16,9 +16,10 @@ Source4:        slim-fedora.txt
 Source5:        slim.logrotate.d
 Source6:        slim-tmpfiles.conf
 # Fedora-specific patches
-Patch0:         slim-1.3.2-make.patch
-Patch1:         slim-1.3.2-fedora.patch
-Patch2:         slim-1.3.2-selinux.patch
+Patch0:         %{name}-1.3.2-make.patch
+Patch1:         %{name}-1.3.2-fedora.patch
+Patch2:         %{name}-1.3.2-selinux.patch
+Patch3:         %{name}-consolekit.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -49,6 +50,7 @@ before launching slim.
 %patch0 -p1 -b .make
 %patch1 -p1 -b .fedora
 %patch2 -p1 -b .selinux
+%patch3 -p1 
 cp -p %{SOURCE4} README.Fedora
 
 %build
@@ -90,6 +92,12 @@ install -p -D %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/slim.conf
 %endif
 
 %changelog
+* Mon Jul 25 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 1.3.2-8
+- slim-consolekit patch https://lists.berlios.de/pipermail/slim-dev/2011-June/000275.html 
+
+* Sun Jul 24 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 1.3.2-7
+- Rebuild for Rawhide
+
 * Wed Jun 01 2011 Jan Kaluza <jkaluza at redhat.com> - 1.3.2-6
 - fix #708693 - added tmfiles.d config to create /var/run/slim directory
 
diff --git a/sources b/sources
index 551a5c5..b711a18 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 ca1ae6120e6f4b4969f2d6cf94f47b42  slim-1.3.2.tar.gz
-69a563902f84529c0b9437603c082574  slim-update_slim_wmlist
-bb11ef362ce7f27433931c51ffdc9657  slim-dynwm


More information about the scm-commits mailing list