[slim/f13/master] slim-update_wm_list regular expression fix

Petr Sabata psabata at fedoraproject.org
Tue Aug 31 08:17:40 UTC 2010


commit 601968ccc6faa5268e966d1dae60628e767f57b7
Author: Petr Sabata <psabata at redhat.com>
Date:   Tue Aug 31 10:17:17 2010 +0200

    slim-update_wm_list regular expression fix

 .gitignore              |    1 +
 slim-update_slim_wmlist |    2 +-
 slim.spec               |    5 ++++-
 sources                 |    1 +
 4 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59d0a4c..d516fa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 slim-1.3.1.tar.gz
 /slim-1.3.2.tar.gz
+/slim-update_slim_wmlist
diff --git a/slim-update_slim_wmlist b/slim-update_slim_wmlist
index 0f11653..942de48 100644
--- a/slim-update_slim_wmlist
+++ b/slim-update_slim_wmlist
@@ -63,7 +63,7 @@ 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|;
+    s|^(sessions\s+).*|$1$wm_list|;
     print NEW_SLIM_CONFIG_FILE;
 }
 
diff --git a/slim.spec b/slim.spec
index 24a9638..21d6c38 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 31 2010 Petr Sabata <psabata at redhat.com> - 1.3.2-2
+- slim-update_wm_list script modification, rhbz#581518
+
 * 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)
diff --git a/sources b/sources
index b711a18..1c656f7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 ca1ae6120e6f4b4969f2d6cf94f47b42  slim-1.3.2.tar.gz
+69a563902f84529c0b9437603c082574  slim-update_slim_wmlist


More information about the scm-commits mailing list