rpms/slim/F-9 slim-1.3.0-fedora.patch, NONE, 1.1 slim-1.3.0-usexwd.patch, NONE, 1.1 slim.spec, 1.6, 1.7 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/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29417

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:
rebuild changes from rawhide

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/F-9/slim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slim.spec	22 Feb 2008 14:32:27 -0000	1.6
+++ slim.spec	5 Oct 2008 09:43:24 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           slim
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://slim.berlios.de/
 Source0:        http://download.berlios.de/slim/%{name}-%{version}.tar.gz
 # stolen from xdm
@@ -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
@@ -28,7 +28,7 @@
 # we use 'include' in the pam file, so
 Requires:       pam >= 0.80
 # reuse the images
-Requires:       desktop-backgrounds-basic system-logos
+Requires:       desktop-backgrounds-basic desktop-backgrounds-compat
 
 %description
 SLiM (Simple Login Manager) is a graphical login manager for X11.
@@ -36,9 +36,10 @@
 desktop environments.
 SLiM is based on latest stable release of Login.app by Per Lidén.
 
-In fedora, slim may be called through a wrapper, slim-dynwm, which determines
-the available window managers using the freedesktop information and modifies
-the slim configuration file accordingly, before launching slim.
+In the distribution, slim may be called through a wrapper, slim-dynwm,
+which determines the available window managers using the freedesktop 
+information and modifies the slim configuration file accordingly,
+before launching slim.
 
 %prep
 %setup -q
@@ -98,6 +99,15 @@
 
 
 %changelog
+* Sun Oct 05 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-7
+- add compat req (#465631)
+
+* 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
+
 * Fri Feb 22 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-4
 - add header for strtol(3)
 


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


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