rpms/slim/devel slim-1.3.1-fedora.patch, NONE, 1.1 slim-1.3.1-make.patch, NONE, 1.1 slim-1.3.1-strtol.patch, NONE, 1.1 slim-1.3.1-usexwd.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 slim.spec, 1.9, 1.10 sources, 1.3, 1.4 slim-1.3.0-fedora.patch, 1.1, NONE slim-1.3.0-make.patch, 1.1, NONE slim-1.3.0-strtol.patch, 1.1, NONE slim-1.3.0-usexwd.patch, 1.1, NONE
Anders F Björklund
afb at fedoraproject.org
Fri Oct 10 07:59:52 UTC 2008
- Previous message: rpms/hunspell-ber/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/gstreamermm/devel .cvsignore, 1.3, 1.4 gstreamermm.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: afb
Update of /cvs/pkgs/rpms/slim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11578
Modified Files:
.cvsignore slim.spec sources
Added Files:
slim-1.3.1-fedora.patch slim-1.3.1-make.patch
slim-1.3.1-strtol.patch slim-1.3.1-usexwd.patch
Removed Files:
slim-1.3.0-fedora.patch slim-1.3.0-make.patch
slim-1.3.0-strtol.patch slim-1.3.0-usexwd.patch
Log Message:
upgrade to slim 1.3.1, thanks mpg
slim-1.3.1-fedora.patch:
--- NEW FILE slim-1.3.1-fedora.patch ---
--- slim-1.3.1/slim.conf.orig 2008-10-09 11:19:28.000000000 +0200
+++ slim-1.3.1/slim.conf 2008-10-09 11:20:21.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/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 @@
# 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.1-make.patch:
--- NEW FILE slim-1.3.1-make.patch ---
--- slim-1.3.1/Makefile.orig 2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/Makefile 2008-10-09 11:17:27.000000000 +0200
@@ -5,7 +5,8 @@
#######################################################
CXX=/usr/bin/g++
CC=/usr/bin/gcc
-CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+OPTFLAGS=-O2 -g -Wall
+CFLAGS=$(OPTFLAGS) -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
CXXFLAGS=$(CFLAGS)
LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
CUSTOM=-DHAVE_SHADOW
@@ -42,10 +43,10 @@
$(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
@@ -61,9 +62,9 @@
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.3.1-strtol.patch:
--- NEW FILE slim-1.3.1-strtol.patch ---
--- slim-1.3.1/cfg.cpp.gcc43 2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/cfg.cpp 2008-10-09 11:28:33.000000000 +0200
@@ -11,6 +11,7 @@
#include <fstream>
#include <string>
#include <iostream>
+#include <stdlib.h> /* strtol */
#include <unistd.h>
#include <stdlib.h>
slim-1.3.1-usexwd.patch:
--- NEW FILE slim-1.3.1-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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 3 Sep 2007 20:15:06 -0000 1.3
+++ .cvsignore 10 Oct 2008 07:59:22 -0000 1.4
@@ -1 +1 @@
-slim-1.3.0.tar.gz
+slim-1.3.1.tar.gz
Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- slim.spec 5 Oct 2008 09:36:26 -0000 1.9
+++ slim.spec 10 Oct 2008 07:59:22 -0000 1.10
@@ -1,6 +1,6 @@
Name: slim
-Version: 1.3.0
-Release: 7%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: Simple Login Manager
Group: User Interface/X
@@ -14,10 +14,10 @@
Source3: slim-fedora.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: slim-1.3.0-make.patch
-Patch1: slim-1.3.0-usexwd.patch
-Patch2: slim-1.3.0-fedora.patch
-Patch3: slim-1.3.0-strtol.patch
+Patch0: slim-1.3.1-make.patch
+Patch1: slim-1.3.1-usexwd.patch
+Patch2: slim-1.3.1-fedora.patch
+Patch3: slim-1.3.1-strtol.patch
BuildRequires: libXmu-devel libXft-devel libXrender-devel
BuildRequires: libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -47,7 +47,6 @@
%patch1 -p1
%patch2 -p1 -b .fedora
%patch3 -p1 -b .gcc43
-sed -e 's@/usr/X11R6/bin@%{_bindir}@g' -i.orig slim.conf
cp -p %{SOURCE3} README.Fedora
%build
@@ -99,6 +98,9 @@
%changelog
+* Thu Oct 09 2008 Marco Pesenti Gritti <mpg at redhat.com> 1.3.1-1
+- Update to 1.3.1
+
* Sun Oct 05 2008 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-7
- add compat req (#465631)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Sep 2007 20:15:06 -0000 1.3
+++ sources 10 Oct 2008 07:59:22 -0000 1.4
@@ -1 +1 @@
-1c1a87f3cbd3c334c874585e42701961 slim-1.3.0.tar.gz
+727d0acb24c0fbf0751134c37a9c895f slim-1.3.1.tar.gz
--- slim-1.3.0-fedora.patch DELETED ---
--- slim-1.3.0-make.patch DELETED ---
--- slim-1.3.0-strtol.patch DELETED ---
--- slim-1.3.0-usexwd.patch DELETED ---
- Previous message: rpms/hunspell-ber/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/gstreamermm/devel .cvsignore, 1.3, 1.4 gstreamermm.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list