rpms/slim/F-11 slim-1.3.1-curdir.patch, NONE, 1.1 slim-1.3.1-selinux.patch, NONE, 1.1 slim.spec, 1.15, 1.16

[Lorenzo Villani]

Author: arbiter

Update of /cvs/pkgs/rpms/slim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20109

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.1-curdir.patch slim-1.3.1-selinux.patch 
Log Message:
* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
- Fix BZ #518068


slim-1.3.1-curdir.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-curdir.patch ---
diff -up slim-1.3.1/slim.conf.orig slim-1.3.1/slim.conf
--- slim-1.3.1/slim.conf.orig	2008-09-26 02:54:15.000000000 +0200
+++ slim-1.3.1/slim.conf	2009-06-11 17:59:06.000000000 +0200
@@ -1,6 +1,6 @@
 # Path, X server and arguments (if needed)
 # Note: -xauth $authfile is automatically appended
-default_path        ./:/bin:/usr/bin:/usr/local/bin
+default_path        /bin:/usr/bin:/usr/local/bin
 default_xserver     /usr/bin/X
 #xserver_arguments   -dpi 75
 

slim-1.3.1-selinux.patch:
 slim.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE slim-1.3.1-selinux.patch ---
diff -Naur slim-1.3.1.orig/slim.conf slim-1.3.1/slim.conf
--- slim-1.3.1.orig/slim.conf	2009-10-10 14:53:36.869317460 +0200
+++ slim-1.3.1/slim.conf	2009-10-10 14:54:03.951442584 +0200
@@ -14,7 +14,7 @@
 xauth_path         /usr/bin/xauth 
 
 # Xauth file for server
-authfile           /var/run/slim.auth
+authfile           /var/run/slim/slim.auth
 
 
 # Activate numlock when slim starts. Valid values: on|off


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-11/slim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- slim.spec	28 Feb 2009 08:48:46 -0000	1.15
+++ slim.spec	10 Oct 2009 13:09:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.1
-Release:        5%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,11 +14,14 @@ Source2:        slim-update_slim_wmlist
 Source3:        slim-fedora.txt
 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
 
 BuildRequires:  libXmu-devel libXft-devel libXrender-devel
 BuildRequires:  libpng-devel libjpeg-devel freetype-devel fontconfig-devel
@@ -51,6 +54,8 @@ before launching slim.
 %patch2 -p1 -b .fedora
 %patch3 -p1 -b .gcc43
 %patch4 -p1 -b .gcc44
+%patch5 -p1 -b .curdir
+%patch6 -p1 -b .selinux
 cp -p %{SOURCE3} README.Fedora
 
 %build
@@ -102,6 +107,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 10 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.1-8
+- Fix BZ #518068
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jun 21 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-6
+- exclude current directory from default_path in slim.conf (#505359)
+
 * Sat Feb 28 2009 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.1-5
 - provide service(graphical-login) for anaconda yuminstall (#485789)