[slim/f12/master] - New upstream version 1.3.2 - Drop slim-1.3.1-usexwd.patch (folded into 02-slim-1.3.2-fedora.patch)
Lorenzo Villani
arbiter at fedoraproject.org
Sun Aug 22 19:12:04 UTC 2010
commit e1cd261148047c10bee84b1b5aba483dcdcd57f7
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date: Sun Aug 22 20:09:45 2010 +0200
- New upstream version 1.3.2
- Drop slim-1.3.1-usexwd.patch (folded into 02-slim-1.3.2-fedora.patch)
- Drop slim-1.3.1-curdir.patch (folded into 02-slim-1.3.2-fedora.patch)
- Drop slim-1.3.1-strtol.patch (merged upstream)
- Drop slim-1.3.1-remove.patch (merged upstream)
- Drop slim-1.3.1-gcc44.patch (merged upstream)
- Drop slim-1.3.1-CVE-2009-1756.patch (merged upstream)
- Drop slim-1.3.1-fix-insecure-mcookie-generation.patch (merged upstream)
.gitignore | 1 +
slim-1.3.1-make.patch => 01-slim-1.3.2-make.patch | 12 +-
....3.1-fedora.patch => 02-slim-1.3.2-fedora.patch | 20 ++-
....1-selinux.patch => 03-slim-1.3.1-selinux.patch | 0
slim-1.3.1-CVE-2009-1756.patch | 175 --------------------
slim-1.3.1-curdir.patch | 11 --
slim-1.3.1-fix-debian-secfix.patch | 64 -------
slim-1.3.1-fix-insecure-mcookie-generation.patch | 175 --------------------
slim-1.3.1-gcc44.patch | 12 --
slim-1.3.1-remove.patch | 12 --
slim-1.3.1-strtol.patch | 10 -
slim-1.3.1-usexwd.patch | 13 --
slim.spec | 47 ++---
sources | 2 +-
14 files changed, 44 insertions(+), 510 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 33e14f3..59d0a4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
slim-1.3.1.tar.gz
+/slim-1.3.2.tar.gz
diff --git a/slim-1.3.1-make.patch b/01-slim-1.3.2-make.patch
similarity index 85%
rename from slim-1.3.1-make.patch
rename to 01-slim-1.3.2-make.patch
index 9cc2afe..49646c5 100644
--- a/slim-1.3.1-make.patch
+++ b/01-slim-1.3.2-make.patch
@@ -1,5 +1,7 @@
---- 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
+Index: slim-1.3.2/Makefile
+===================================================================
+--- slim-1.3.2.orig/Makefile
++++ slim-1.3.2/Makefile
@@ -5,7 +5,8 @@
#######################################################
CXX=/usr/bin/g++
@@ -8,9 +10,9 @@
+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
+ LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
CUSTOM=-DHAVE_SHADOW
-@@ -42,10 +43,10 @@
+@@ -42,10 +43,10 @@ slim: $(OBJECTS)
$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
install: slim install-theme
@@ -24,7 +26,7 @@
clean:
@rm -f slim *.o
-@@ -61,9 +62,9 @@
+@@ -61,9 +62,9 @@ dist:
install-theme:
diff --git a/slim-1.3.1-fedora.patch b/02-slim-1.3.2-fedora.patch
similarity index 60%
rename from slim-1.3.1-fedora.patch
rename to 02-slim-1.3.2-fedora.patch
index bf98074..48afee4 100644
--- a/slim-1.3.1-fedora.patch
+++ b/02-slim-1.3.2-fedora.patch
@@ -1,6 +1,8 @@
---- 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 @@
+Index: slim-1.3.2/slim.conf
+===================================================================
+--- slim-1.3.2.orig/slim.conf
++++ slim-1.3.2/slim.conf
+@@ -7,7 +7,7 @@ default_xserver /usr/bin/X
# Commands for halt, login, etc.
halt_cmd /sbin/shutdown -h now
reboot_cmd /sbin/shutdown -r now
@@ -9,7 +11,7 @@
#suspend_cmd /usr/sbin/suspend
# Full path to the xauth binary
-@@ -33,7 +33,7 @@
+@@ -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
@@ -18,3 +20,13 @@
# Commands executed when starting and exiting a session.
# They can be used for registering a X11 session with
+@@ -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
diff --git a/slim-1.3.1-selinux.patch b/03-slim-1.3.1-selinux.patch
similarity index 100%
rename from slim-1.3.1-selinux.patch
rename to 03-slim-1.3.1-selinux.patch
diff --git a/slim.spec b/slim.spec
index a41e1ce..24a9638 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,6 +1,6 @@
Name: slim
-Version: 1.3.1
-Release: 13%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: Simple Login Manager
Group: User Interface/X
@@ -16,21 +16,10 @@ Source3: slim-fedora.txt
Source4: slim.logrotate.d
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# TODO: Post these patches to upstream BTS
-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
-Patch4: slim-1.3.1-remove.patch
-Patch5: slim-1.3.1-curdir.patch
-Patch6: slim-1.3.1-selinux.patch
-# This is from Debian, I just added -lrt to LDFLAGS
-Patch7: slim-1.3.1-CVE-2009-1756.patch
-# This one is from Debian, too
-Patch8: slim-1.3.1-fix-insecure-mcookie-generation.patch
-Patch9: slim-1.3.1-gcc44.patch
-# Fix weirdness introduced in patch 7
-Patch10: slim-1.3.1-fix-debian-secfix.patch
+# Fedora-specific patches
+Patch0: 01-slim-1.3.2-make.patch
+Patch1: 02-slim-1.3.2-fedora.patch
+Patch2: 03-slim-1.3.1-selinux.patch
BuildRequires: libXmu-devel libXft-devel libXrender-devel
BuildRequires: libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -58,17 +47,9 @@ before launching slim.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .fedora
-%patch3 -p1 -b .gcc43
-%patch4 -p1 -b .gcc44
-%patch5 -p1 -b .curdir
-%patch6 -p1 -b .selinux
-%patch7 -p1 -b .CVE-2009-1756
-%patch8 -p1 -b .mcookie
-%patch9 -p1 -b .gcc44again
-%patch10 -p1 -b .fixdebpatch
+%patch0 -p1 -b .make
+%patch1 -p1 -b .fedora
+%patch2 -p1 -b .selinux
cp -p %{SOURCE3} README.Fedora
%build
@@ -127,6 +108,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 22 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.2-1
+- New upstream version 1.3.2
+- Drop slim-1.3.1-usexwd.patch (folded into 02-slim-1.3.2-fedora.patch)
+- Drop slim-1.3.1-curdir.patch (folded into 02-slim-1.3.2-fedora.patch)
+- Drop slim-1.3.1-strtol.patch (merged upstream)
+- Drop slim-1.3.1-remove.patch (merged upstream)
+- Drop slim-1.3.1-gcc44.patch (merged upstream)
+- Drop slim-1.3.1-CVE-2009-1756.patch (merged upstream)
+- Drop slim-1.3.1-fix-insecure-mcookie-generation.patch (merged upstream)
+
* Tue Mar 30 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-13
- Missing /var/run/slim (Fix bz#573284)
diff --git a/sources b/sources
index 34dc410..b711a18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-727d0acb24c0fbf0751134c37a9c895f slim-1.3.1.tar.gz
+ca1ae6120e6f4b4969f2d6cf94f47b42 slim-1.3.2.tar.gz
More information about the scm-commits
mailing list