From 86264f891c1dd44ca104da81e508cdcd8bfd05c7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:17:16 +0000 Subject: import xdg-utils-1.1.0-0.17.20120809git.el7 --- diff --git a/SOURCES/xdg-screensaver-lock.patch b/SOURCES/xdg-screensaver-lock.patch new file mode 100644 index 0000000..2d2ba74 --- /dev/null +++ b/SOURCES/xdg-screensaver-lock.patch @@ -0,0 +1,34 @@ +diff -up xdg-utils-1.1.0/scripts/xdg-screensaver.in.use-dbus xdg-utils-1.1.0/scripts/xdg-screensaver.in +--- xdg-utils-1.1.0/scripts/xdg-screensaver.in.use-dbus 2016-03-15 16:47:46.194698630 -0400 ++++ xdg-utils-1.1.0/scripts/xdg-screensaver.in 2016-03-15 16:48:45.221438504 -0400 +@@ -462,7 +462,12 @@ screensaver_gnome_screensaver() + ;; + + lock) +- gnome-screensaver-command --lock > /dev/null 2> /dev/null ++ dbus-send --session \ ++ --dest=org.gnome.ScreenSaver \ ++ --type=method_call \ ++ /org/gnome/ScreenSaver \ ++ org.gnome.ScreenSaver.Lock \ ++ 2> /dev/null + result=$? + ;; + +diff -up xdg-utils-1.1.0/scripts/xdg-screensaver.use-dbus xdg-utils-1.1.0/scripts/xdg-screensaver +--- xdg-utils-1.1.0/scripts/xdg-screensaver.use-dbus 2016-03-15 16:48:56.480579481 -0400 ++++ xdg-utils-1.1.0/scripts/xdg-screensaver 2016-03-15 16:49:18.607856400 -0400 +@@ -786,7 +786,12 @@ screensaver_gnome_screensaver() + ;; + + lock) +- gnome-screensaver-command --lock > /dev/null 2> /dev/null ++ dbus-send --session \ ++ --dest=org.gnome.ScreenSaver \ ++ --type=method_call \ ++ /org/gnome/ScreenSaver \ ++ org.gnome.ScreenSaver.Lock \ ++ 2> /dev/null + result=$? + ;; + diff --git a/SPECS/xdg-utils.spec b/SPECS/xdg-utils.spec index 149cf6f..2f09a55 100644 --- a/SPECS/xdg-utils.spec +++ b/SPECS/xdg-utils.spec @@ -5,7 +5,7 @@ Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.0 -Release: 0.16.%{snap}%{?dist} +Release: 0.17.%{snap}%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?snap:1} @@ -14,6 +14,9 @@ Source1: xdg-utils-git_checkout.sh %else Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz %endif + +Patch0: xdg-screensaver-lock.patch + License: MIT Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,7 +56,7 @@ The following scripts are provided at this time: %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} - +%patch0 -p1 %build %configure @@ -97,6 +100,10 @@ rm -rf %{buildroot} %changelog +* Tue Mar 15 2016 Matthias Clasen - 1.1.0-0.17.20120809git +- Fix screensaver locking in GNOME +Resolves: #1083390 + * Fri Dec 27 2013 Daniel Mach - 1.1.0-0.16.20120809git - Mass rebuild 2013-12-27