From 55ca01c3c0606ceb1ecaed0379bfe03aa9b177d3edcfeac86b22f50a2b3853bf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 19 Sep 2013 19:18:53 +0000 Subject: [PATCH] Accepting request 199759 from home:dimstar:branches:GNOME:Factory - Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1: + Disable wacom support on s390{x}, those machines have no viable input ports. + Have pkgconfig(libwacom) and pkgconfig(xorg-wacom) BuildRequries depend on with_wacom. - Update to version 3.9.92: + Several fixes to the test suite. + Color: - Correct the transposed bits in the EDID parser. + Datetime: - Set geoclue distance threshold. + Power: - Fix a crash when hibernating on low power. - Ignore battery devices that aren't present. - Update the composite device on startup. - Default to the keyboard backlight being unavailable. + Updates: - Fix a crash. - Use gnome-software if it is installed. - Do not clear the offline-update if rebooting succeeded. + Wacom: - Fix a crash. OBS-URL: https://build.opensuse.org/request/show/199759 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=177 --- gnome-settings-daemon-3.9.91.1.tar.xz | 3 --- gnome-settings-daemon-3.9.92.tar.xz | 3 +++ gnome-settings-daemon.changes | 30 +++++++++++++++++++++++++++ gnome-settings-daemon.spec | 25 +++++++++++++++------- 4 files changed, 51 insertions(+), 10 deletions(-) delete mode 100644 gnome-settings-daemon-3.9.91.1.tar.xz create mode 100644 gnome-settings-daemon-3.9.92.tar.xz diff --git a/gnome-settings-daemon-3.9.91.1.tar.xz b/gnome-settings-daemon-3.9.91.1.tar.xz deleted file mode 100644 index a53c58d..0000000 --- a/gnome-settings-daemon-3.9.91.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e51d4e1d0ca7369c35075b9271a3e24cd33ccdd3e5c851f83e3adc2606b7c1b -size 1660080 diff --git a/gnome-settings-daemon-3.9.92.tar.xz b/gnome-settings-daemon-3.9.92.tar.xz new file mode 100644 index 0000000..6ab7179 --- /dev/null +++ b/gnome-settings-daemon-3.9.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29e593b4867bda78edf6f0979e74366d1c9b4042390674a098a59d0520d41d79 +size 1642816 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index b96f772..4afdf5f 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 19 13:20:55 UTC 2013 - idonmez@suse.com + +- Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1: + + Disable wacom support on s390{x}, those machines have no + viable input ports. + + Have pkgconfig(libwacom) and pkgconfig(xorg-wacom) + BuildRequries depend on with_wacom. + +------------------------------------------------------------------- +Tue Sep 17 21:02:03 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.92: + + Several fixes to the test suite. + + Color: + - Correct the transposed bits in the EDID parser. + + Datetime: + - Set geoclue distance threshold. + + Power: + - Fix a crash when hibernating on low power. + - Ignore battery devices that aren't present. + - Update the composite device on startup. + - Default to the keyboard backlight being unavailable. + + Updates: + - Fix a crash. + - Use gnome-software if it is installed. + - Do not clear the offline-update if rebooting succeeded. + + Wacom: + - Fix a crash. + ------------------------------------------------------------------- Fri Sep 6 17:56:00 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 3cd9ffe..0da1c1c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -26,8 +26,15 @@ # Smart-Card support is disabled in version 3.7.3 %define with_smartcard 1 +# Wacom input support +%ifarch s390 s390x +%define with_wacom 0 +%else +%define with_wacom 1 +%endif + Name: gnome-settings-daemon -Version: 3.9.91.1 +Version: 3.9.92 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ @@ -79,7 +86,10 @@ BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2 %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-login) %endif +%if %{with_wacom} BuildRequires: pkgconfig(libwacom) >= 0.7 +BuildRequires: pkgconfig(xorg-wacom) +%endif BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(packagekit-glib2) >= 0.7.4 BuildRequires: pkgconfig(pango) >= 1.20.0 @@ -90,7 +100,6 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(xorg-wacom) BuildRequires: pkgconfig(xtst) Requires: gsettings-desktop-schemas # g-s-d uses the pkexec binary @@ -189,11 +198,8 @@ rm -rf %{buildroot} %{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon %{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon-localeexec %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom %{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper %{_libexecdir}/gnome-settings-daemon-3.0/gsd-test-* # From patch2 #%{_libexecdir}/novell-sysconfig-proxy-helper @@ -207,7 +213,6 @@ rm -rf %{buildroot} %{_libdir}/gnome-settings-daemon-3.0/libcolor.so %{_libdir}/gnome-settings-daemon-3.0/libcursor.so %{_libdir}/gnome-settings-daemon-3.0/libdatetime.so -%{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so %{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so %{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so @@ -245,12 +250,18 @@ rm -rf %{buildroot} %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.* %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy -%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy %{_mandir}/man1/gnome-settings-daemon.1%{?ext_man} # Own the directory since we can't depend on gconf providing them %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert +%if %{with_wacom} +%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy +%{_libexecdir}/gnome-settings-daemon-3.0/gsd-list-wacom +%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-led-helper +%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper +%{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so +%endif %files lang -f %{name}.lang