rpms/slim/devel slim-1.3.0-fedora.patch, NONE, 1.1 slim-1.3.0-usexwd.patch, NONE, 1.1 slim.spec, 1.7, 1.8 slim-1.2.6-fedora.patch, 1.1, NONE slim-1.2.6-usexwd.patch, 1.1, NONE

[Anders F Björklund]

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20811

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.0-fedora.patch slim-1.3.0-usexwd.patch 
Removed Files:
	slim-1.2.6-fedora.patch slim-1.2.6-usexwd.patch 
Log Message:
fix patch fuzz

slim-1.3.0-fedora.patch:

--- NEW FILE slim-1.3.0-fedora.patch ---
--- slim-1.3.0/slim.conf.orig	2007-05-07 10:01:02.000000000 +0200
+++ slim-1.3.0/slim.conf	2007-05-13 23:55:18.000000000 +0200
@@ -7,7 +7,7 @@
 # Commands for halt, login, etc.
 halt_cmd            /sbin/shutdown -h now
 reboot_cmd          /sbin/shutdown -r now
-console_cmd         /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
+console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue | sed -e 's/\\\\r/`uname -r`/' -e 's/\\\\m/`uname -m`/'; exec /bin/login"
 #suspend_cmd        /usr/sbin/suspend
 
 # Full path to the xauth binary
@@ -33,7 +33,7 @@ authfile           /var/run/slim.auth
 # to adjust the command according to your preferred shell,
 # i.e. for freebsd use:
 # login_cmd           exec /bin/sh - ~/.xinitrc %session
-login_cmd           exec /bin/bash -login ~/.xinitrc %session
+login_cmd           if [ -r ~/.xinitrc ]; then exec /bin/bash -login ~/.xinitrc %session; else PREFERRED=%session exec /bin/bash -login /etc/X11/xinit/xinitrc; fi
 
 # Commands executed when starting and exiting a session.
 # They can be used for registering a X11 session with

slim-1.3.0-usexwd.patch:

--- NEW FILE slim-1.3.0-usexwd.patch ---
diff -up slim-1.3.0/slim.conf.orig slim-1.3.0/slim.conf
--- slim-1.3.0/slim.conf.orig	2007-07-15 16:09:28.000000000 +0200
+++ slim-1.3.0/slim.conf	2008-09-24 15:32:17.000000000 +0200
@@ -54,7 +54,8 @@ login_cmd           exec /bin/bash -logi
 sessions            xfce4,icewm,wmaker,blackbox
 
 # Executed when pressing F11 (requires imagemagick)
-screenshot_cmd      import -window root /slim.png
+#screenshot_cmd      import -window root /slim.png
+screenshot_cmd      xwd -root > /slim.xwd
 
 # welcome message. Available variables: %host, %domain
 welcome_msg         Welcome to %host


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slim.spec	19 May 2008 15:19:32 -0000	1.7
+++ slim.spec	24 Sep 2008 13:42:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -15,8 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         slim-1.3.0-make.patch
-Patch1:         slim-1.2.6-usexwd.patch
-Patch2:         slim-1.2.6-fedora.patch
+Patch1:         slim-1.3.0-usexwd.patch
+Patch2:         slim-1.3.0-fedora.patch
 Patch3:         slim-1.3.0-strtol.patch
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Wed Sep 24 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-6
+- fix patch fuzz
+
 * Fri May 16 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-5
 - all the images are now in desktop-backgrounds-basic
 


--- slim-1.2.6-fedora.patch DELETED ---


--- slim-1.2.6-usexwd.patch DELETED ---