[xscreensaver] Don't autostart xscreensaver when mate-screensaver is installed.
Mamoru Tasaka
mtasaka at fedoraproject.org
Sun Apr 21 23:01:34 UTC 2013
commit 05472cca03df39983de8b8e1032cf061398863e4
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Mon Apr 22 08:01:11 2013 +0900
Don't autostart xscreensaver when mate-screensaver is installed.
xscreensaver-autostart | 1 +
xscreensaver.spec | 5 ++++-
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-autostart b/xscreensaver-autostart
index 2723280..5ab285f 100644
--- a/xscreensaver-autostart
+++ b/xscreensaver-autostart
@@ -4,5 +4,6 @@
# is installed
if [ -x /usr/bin/gnome-screensaver ] ; then exit 0 ; fi
+if [ -x /usr/bin/mate-screensaver ] ; then exit 0 ; fi
exec xscreensaver -nosplash
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 82e0bcf..73184f9 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 4
+%define fedora_rel 5
%undefine extrarel
@@ -829,6 +829,9 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-5
+- Don't autostart xscreensaver when mate-screensaver is installed.
+
* Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-4
- Fix engine crash with one byte ahead access (bug 954115)
More information about the scm-commits
mailing list