rpms/slim/devel slim-1.2.6-fedora.patch, NONE, 1.1 slim-1.2.6-make.patch, NONE, 1.1 slim-1.2.6-usexwd.patch, NONE, 1.1 slim-fedora.txt, NONE, 1.1 slim-update_slim_wmlist, NONE, 1.1 slim.pam, NONE, 1.1 slim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Anders F Björklund (afb)
fedora-extras-commits at redhat.com
Tue Jul 17 09:50:21 UTC 2007
Author: afb
Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22304/devel
Modified Files:
.cvsignore sources
Added Files:
slim-1.2.6-fedora.patch slim-1.2.6-make.patch
slim-1.2.6-usexwd.patch slim-fedora.txt
slim-update_slim_wmlist slim.pam slim.spec
Log Message:
initial import, first package
slim-1.2.6-fedora.patch:
--- NEW FILE slim-1.2.6-fedora.patch ---
--- slim-1.2.6/slim.conf.orig 2007-05-07 10:01:02.000000000 +0200
+++ slim-1.2.6/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.2.6-make.patch:
--- NEW FILE slim-1.2.6-make.patch ---
--- slim-1.2.6/Makefile.orig 2006-09-15 23:00:37.000000000 +0200
+++ slim-1.2.6/Makefile 2007-05-07 00:41:42.000000000 +0200
@@ -5,7 +5,10 @@
#######################################################
CXX=/usr/bin/g++
CC=/usr/bin/gcc
-CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+INSTALL=install
+OPTFLAGS=-O2 -g
+CFLAGS=$(OPTFLAGS) -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+CXXFLAGS=$(CFLAGS)
LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
CUSTOM=-DHAVE_SHADOW
PREFIX=/usr
@@ -28,16 +31,16 @@ slim: $(OBJECTS)
$(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME)
.cpp.o:
- $(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
+ $(CXX) $(CXXFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
.c.o:
$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
install: slim install-theme
- install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
- install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
+ $(INSTALL) -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
+ $(INSTALL) -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
- install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+ $(INSTALL) -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
clean:
@rm -f slim *.o
@@ -53,9 +56,9 @@ dist:
install-theme:
- install -D -m 644 themes/default/slim.theme \
+ $(INSTALL) -D -m 644 themes/default/slim.theme \
$(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
- install -D -m 644 themes/default/panel.png \
+ $(INSTALL) -D -m 644 themes/default/panel.png \
$(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
- install -D -m 644 themes/default/background.jpg \
+ $(INSTALL) -D -m 644 themes/default/background.jpg \
$(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg
slim-1.2.6-usexwd.patch:
--- NEW FILE slim-1.2.6-usexwd.patch ---
--- slim-1.2.6/slim.conf.orig 2007-05-07 10:01:02.000000000 +0200
+++ slim-1.2.6/slim.conf 2007-05-07 10:01:59.000000000 +0200
@@ -55,7 +55,8 @@ sessions xfce4,icewm,wmaker,b
# Executed when pressing F11 (requires imagemagick)
-screenshot_cmd import -window root /slim.png
+#screenshot_cmd import -window root /slim.png
+screenshot_cmd /usr/X11R6/bin/xwd -root > /slim.xwd
# welcome message. Available variables: %host, %domain
welcome_msg Welcome to %host
--- NEW FILE slim-fedora.txt ---
To use SLiM with Fedora, put the following
in your /etc/sysconfig/desktop configuration:
DISPLAYMANAGER=/usr/bin/slim-dynwm
To reboot or halt, login in as special username
"reboot" or "halt" - using the root password.
To get a console prompt use username "console",
and to switch sessions use F1, screenshot F11.
To view screenshots you can use ImageMagick:
convert /slim.xwd /slim.png
--- NEW FILE slim-update_slim_wmlist ---
#!/usr/bin/perl -w
#
# update_slim_wmlist, based on:
# update_wdm_wmlist, (c) 1998 Marcelo Magallón <mmagallo at debian.org>
# rewriten to use the x-window-manager alternative
# modified to also use the x-session-manager alternative by Arthur Korn
# Copyright 2000 Wichert Akkerman <wakkerma at debian.org>
# Modified to use the freedesktop.org .desktop like kdm and gdm
#
# This script will read the list of installed window managers from
# the freedesktop .desktop files in <etc>/X11/sessions/:<etc>/dm/Sessions/:
# <share>/xsessions/
# and update the sessions line in /etc/slim.conf.
# BEWARE: It doesn't ask any questions about this. It just does it. It
# takes an optional list of window managers.
use strict;
use File::DesktopEntry;
my $wm_list='';
my %desktop_files;
unless (@ARGV) {
#my @wm_list = ('default');
my @wm_list;
foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') {
next unless (opendir DIR, $dir);
my @files;
@files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR);
foreach my $file (@files) {
push @{$desktop_files{$file}}, "$dir/$file";
}
}
DESKTOP: foreach my $desktop_file (keys(%desktop_files)) {
foreach my $file (@{$desktop_files{$desktop_file}}) {
my $entry = File::DesktopEntry->new_from_file($file);
next DESKTOP if (defined($entry->get_value('Hidden'))
and $entry->get_value('Hidden') eq 'true');
if ($entry->get_value('Name') =~ /^gnome$/i) {
push (@wm_list, 'gnome');
}
elsif ($entry->get_value('Name') =~ /^kde$/i) {
push (@wm_list, 'kde');
}
elsif (defined($entry->get_value('Exec'))) {
push (@wm_list, $entry->get_value('Exec'));
}
else { # not found, go to next file
next;
}
# found, proceed to next destop file
next DESKTOP;
}
}
$wm_list = join (',', sort @wm_list) . ',custom';
} else {
$wm_list = join (',', sort @ARGV);
}
open (SLIM_CONFIG_FILE, '</etc/slim.conf')
or die "Can't open /etc/slim.conf for reading: $!";
open (NEW_SLIM_CONFIG_FILE, '>/etc/slim.conf.new')
or die "Can't open /etc/slim.conf.new for writing: $!";
while (<SLIM_CONFIG_FILE>) {
s|^(sessions\s*).*|$1$wm_list|;
print NEW_SLIM_CONFIG_FILE;
}
close(SLIM_CONFIG_FILE);
close(NEW_SLIM_CONFIG_FILE);
rename '/etc/slim.conf.new', '/etc/slim.conf'
or die "Can't rename /etc/slim.conf.new: $!";
exit 0;
--- NEW FILE slim.pam ---
#%PAM-1.0
auth required pam_env.so
auth include system-auth
account required pam_nologin.so
account include system-auth
password include system-auth
session optional pam_keyinit.so force revoke
session include system-auth
session required pam_loginuid.so
session optional pam_console.so
--- NEW FILE slim.spec ---
Name: slim
Version: 1.2.6
Release: 5%{?dist}
Summary: Simple Login Manager
Group: User Interface/X
License: GPL
URL: http://slim.berlios.de/
Source0: http://download.berlios.de/slim/%{name}-%{version}.tar.gz
# stolen from xdm
Source1: %{name}.pam
# adapted from debian to use freedesktop
Source2: slim-update_slim_wmlist
Source3: slim-fedora.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: slim-1.2.6-make.patch
Patch1: slim-1.2.6-usexwd.patch
Patch2: slim-1.2.6-fedora.patch
BuildRequires: libXmu-devel libXft-devel libXrender-devel
BuildRequires: libpng-devel libjpeg-devel freetype-devel fontconfig-devel
BuildRequires: pkgconfig gettext libselinux-devel pam-devel
BuildRequires: xwd xterm /sbin/shutdown
Requires: xwd xterm /sbin/shutdown
Requires: %{_sysconfdir}/pam.d
# we use 'include' in the pam file, so
Requires: pam >= 0.80
# reuse the images
Requires: desktop-backgrounds-basic fedora-logos
%description
SLiM (Simple Login Manager) is a graphical login manager for X11.
It aims to be simple, fast and independent from the various
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.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .fedora
sed -e 's@/usr/X11R6/bin@%{_bindir}@g' -i.orig slim.conf
cp -p %{SOURCE3} README.Fedora
%build
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' MANDIR=%{_mandir}
install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_slim_wmlist
# do a slim wrapper which updates the window manager list before
# launching slim
cat > $RPM_BUILD_ROOT%{_bindir}/slim-dynwm << EOF
#!/bin/sh
update_slim_wmlist
if [ "x\$1" = "x-nodaemon" ]; then
shift
exec slim "\$@"
else
slim -d "\$@"
fi
EOF
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/slim-dynwm
chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/slim.conf
install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/slim
# use default background image
rm -f $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
ln -s ../../../backgrounds/images/default.jpg $RPM_BUILD_ROOT%{_datadir}/slim/themes/default/background.jpg
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README* THEMES TODO
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pam.d/slim
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/slim.conf
%{_bindir}/slim*
%{_bindir}/update_slim_wmlist
%{_mandir}/man1/slim*.1*
%dir %{_datadir}/slim
%{_datadir}/slim/themes/
%changelog
* Tue May 22 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-5
- make sure to own datadir slim parent too
* Mon May 21 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-4
- use desktop background, instead of slim
- leave (unused) pam files in the package
* Mon May 14 2007 Anders F Bjorklund <afb at users.sourceforge.net>
- clean up spec file
- correct README user
* Sun May 13 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-3
- use slim background instead of default
- added more build dependencies / -devel
- add "README.Fedora"
- patch issue display
* Wed May 09 2007 Anders F Bjorklund <afb at users.sourceforge.net>
- clean up spec file
- noreplace slim.conf
* Tue May 08 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-2
- fixed source URL
- added libXft-devel
- removed xrdb dependency (left from wdm)
- added xwd dependency (for screenshots)
* Sun May 06 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-1
- initial package
- adopted wdm spec
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Jul 2007 15:00:38 -0000 1.1
+++ .cvsignore 17 Jul 2007 09:49:49 -0000 1.2
@@ -0,0 +1 @@
+slim-1.2.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Jul 2007 15:00:38 -0000 1.1
+++ sources 17 Jul 2007 09:49:49 -0000 1.2
@@ -0,0 +1 @@
+1bf891f046014a03236c21ce6cbe455b slim-1.2.6.tar.gz
More information about the scm-commits
mailing list