pool/gnome-settings-daemon
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 162019 from GNOME:Factory

Browse Source 
Update to 3.8.0

OBS-URL: https://build.opensuse.org/request/show/162019
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=88
This commit is contained in:
Stephan Kulow 2013-04-03 21:46:02 +00:00 committed by Git OBS Bridge
commit 6c10657963
7 changed files with 332 additions and 1530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-settings-daemon-3.6.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc
size 1492024

3
gnome-settings-daemon-3.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dff9e725a34158558836843e17079f602522bc30f05acf96cb2712eb4544c9ea
size 1586548

12
gnome-settings-daemon-bnc462640-mute-action.patch
View File

@ -2,7 +2,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
=================================================================== ===================================================================
--- plugins/media-keys/gsd-media-keys-manager.c.orig --- plugins/media-keys/gsd-media-keys-manager.c.orig
+++ plugins/media-keys/gsd-media-keys-manager.c +++ plugins/media-keys/gsd-media-keys-manager.c
@@ -1070,6 +1070,7 @@ do_sound_action (GsdMediaKeysManager *ma @@ -1187,6 +1187,7 @@ do_sound_action (GsdMediaKeysManager *ma
{ {
GvcMixerStream *stream; GvcMixerStream *stream;
gboolean old_muted, new_muted; gboolean old_muted, new_muted;
@ -10,7 +10,7 @@ Index: plugins/media-keys/gsd-media-keys-manager.c
guint old_vol, new_vol, norm_vol_step; guint old_vol, new_vol, norm_vol_step;
gboolean sound_changed; gboolean sound_changed;
@@ -1091,7 +1092,11 @@ do_sound_action (GsdMediaKeysManager *ma @@ -1215,7 +1216,11 @@ do_sound_action (GsdMediaKeysManager *ma
switch (type) { switch (type) {
case MUTE_KEY: case MUTE_KEY:
@ -27,7 +27,7 @@ Index: data/gnome-settings-daemon.convert
=================================================================== ===================================================================
--- data/gnome-settings-daemon.convert.orig --- data/gnome-settings-daemon.convert.orig
+++ data/gnome-settings-daemon.convert +++ data/gnome-settings-daemon.convert
@@ -61,6 +61,7 @@ volume-down = /apps/gnome_settings_daemo @@ -57,6 +57,7 @@ volume-down = /apps/gnome_settings_daemo
volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
volume-up = /apps/gnome_settings_daemon/keybindings/volume_up volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
www = /apps/gnome_settings_daemon/keybindings/www www = /apps/gnome_settings_daemon/keybindings/www
@ -39,9 +39,9 @@ Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
=================================================================== ===================================================================
--- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig --- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig
+++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in +++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -185,6 +185,11 @@ @@ -175,6 +175,11 @@
<_summary>Switch input source backward</_summary> <_summary>Magnifier zoom out</_summary>
<_description>Binding to select the previous input source</_description> <_description>Binding for the magnifier to zoom out</_description>
</key> </key>
+ <key name="toggle-mute" type="b"> + <key name="toggle-mute" type="b">
+ <default>true</default> + <default>true</default>

1468
gnome-settings-daemon-double-suspend.patch
View File

File diff suppressed because it is too large Load Diff

52
gnome-settings-daemon-notify-idle-resumed.patch
View File

@ -1,8 +1,8 @@
Index: gnome-settings-daemon-3.6.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in Index: gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
=================================================================== ===================================================================
--- gnome-settings-daemon-3.6.3.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in --- gnome-settings-daemon-3.7.90.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ gnome-settings-daemon-3.6.3/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in +++ gnome-settings-daemon-3.7.90/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -148,5 +148,10 @@ @@ -106,5 +106,10 @@
<_summary>If we should show the recalled battery warning for a broken battery</_summary> <_summary>If we should show the recalled battery warning for a broken battery</_summary>
<_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description> <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
</key> </key>
@ -13,27 +13,27 @@ Index: gnome-settings-daemon-3.6.3/data/org.gnome.settings-daemon.plugins.power.
+ </key> + </key>
</schema> </schema>
</schemalist> </schemalist>
Index: gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c Index: gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
=================================================================== ===================================================================
--- gnome-settings-daemon-3.6.3.orig/plugins/power/gsd-power-manager.c --- gnome-settings-daemon-3.7.90.orig/plugins/power/gsd-power-manager.c
+++ gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c +++ gnome-settings-daemon-3.7.90/plugins/power/gsd-power-manager.c
@@ -194,6 +194,7 @@ struct GsdPowerManagerPrivate @@ -186,6 +186,7 @@ struct GsdPowerManagerPrivate
UpDevice *device_composite;
NotifyNotification *notification_discharging;
NotifyNotification *notification_low; NotifyNotification *notification_low;
NotifyNotification *notification_sleep_warning;
NotifyNotification *notification_logout_warning;
+ NotifyNotification *notification_resumed; + NotifyNotification *notification_resumed;
ca_context *canberra_context; GsdPowerActionType sleep_action_type;
ca_proplist *critical_alert_loop_props; gboolean battery_is_low; /* laptop battery low, or UPS discharging */
guint32 critical_alert_timeout_id;
@@ -204,6 +205,7 @@ struct GsdPowerManagerPrivate @@ -212,6 +213,7 @@ struct GsdPowerManagerPrivate
GtkStatusIcon *status_icon; gboolean inhibit_suspend_taken;
guint xscreensaver_watchdog_timer_id; guint inhibit_lid_switch_timer_id;
gboolean is_virtual_machine; gboolean is_virtual_machine;
+ GsdPowerActionType last_idle_power_action; + GsdPowerActionType last_idle_power_action;
/* systemd stuff */ /* Idles */
GDBusProxy *logind_proxy; GnomeIdleMonitor *idle_monitor;
@@ -2909,6 +2911,49 @@ kbd_backlight_dim (GsdPowerManager *mana @@ -2452,6 +2454,49 @@ is_session_active (GsdPowerManager *mana
} }
static void static void
@ -83,7 +83,7 @@ Index: gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c
idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode) idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
@@ -3012,6 +3057,8 @@ idle_set_mode (GsdPowerManager *manager, @@ -2544,6 +2589,8 @@ idle_set_mode (GsdPowerManager *manager,
action_type = g_settings_get_enum (manager->priv->settings, action_type = g_settings_get_enum (manager->priv->settings,
"sleep-inactive-ac-type"); "sleep-inactive-ac-type");
} }
@ -92,7 +92,7 @@ Index: gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c
do_power_action_type (manager, action_type); do_power_action_type (manager, action_type);
/* turn on screen and restore user-selected brightness level */ /* turn on screen and restore user-selected brightness level */
@@ -3066,7 +3113,6 @@ idle_set_mode (GsdPowerManager *manager, @@ -2590,7 +2637,6 @@ idle_set_mode (GsdPowerManager *manager,
} }
manager->priv->kbd_brightness_pre_dim = -1; manager->priv->kbd_brightness_pre_dim = -1;
} }
@ -100,9 +100,9 @@ Index: gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c
} }
} }
@@ -3932,6 +3978,12 @@ handle_resume_actions (GsdPowerManager * @@ -3364,6 +3410,12 @@ handle_resume_actions (GsdPowerManager *
notify_close_if_showing (manager->priv->notification_low); notify_close_if_showing (manager->priv->notification_ups_discharging);
notify_close_if_showing (manager->priv->notification_discharging); main_battery_or_ups_low_changed (manager, FALSE);
+ if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND || + if (manager->priv->last_idle_power_action == GSD_POWER_ACTION_SUSPEND ||
+ manager->priv->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE) + manager->priv->last_idle_power_action == GSD_POWER_ACTION_HIBERNATE)
@ -111,5 +111,5 @@ Index: gnome-settings-daemon-3.6.3/plugins/power/gsd-power-manager.c
+ manager->priv->last_idle_power_action = GSD_POWER_ACTION_NOTHING; + manager->priv->last_idle_power_action = GSD_POWER_ACTION_NOTHING;
+ +
/* ensure we turn the panel back on after resume */ /* ensure we turn the panel back on after resume */
ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, backlight_enable (manager);
GNOME_RR_DPMS_ON,

279
gnome-settings-daemon.changes
View File

@ -1,3 +1,282 @@
-------------------------------------------------------------------
Tue Mar 26 10:15:41 UTC 2013 - dimstar@opensuse.org
- Update to version 3.8.0:
+ Color:
- Set the default profile locale to be en_US, not EN_us.
+ Cursor:
- Fix crash with X.org prior to 1.14, requires a matching
gnome-desktop release as well.
+ Power:
- Fix state problems if gnome-shell crashes or is killed within
the screensaver.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 25 21:40:18 UTC 2013 - dimstar@opensuse.org
- Fix gnome-settings-daemon-bnc462640-mute-action.patch: At some
point the schema changed and even though the patch applied, it
was at the wrong point in the schema.
-------------------------------------------------------------------
Tue Mar 19 20:07:51 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.92:
+ Font:
- Remove reference to font schema.
+ Keyboard:
- Fix extra layouts being forgotten on GDM's second launch.
- Fix dead keys and similar features being broken in legacy
applications.
- Avoid delay switch to IBus input source the first time
around.
+ Media keys:
- Remove obsolete check for XInput2.
- Use the shell's D-Bus interface to show OSDs.
- Fix warnings on startup trying to call gnome-shell.
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 5 14:43:49 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.91:
+ Cursor:
- Disable code to make it popup the On-Screen Keyboard on
touchscreens.
+ Media keys:
- Key grabbing is now done in gnome-shell, which fixes problems
with keybindings not working in certain conditions.
+ Sound:
- Fix possible crashes when starting in a clean home directory.
-------------------------------------------------------------------
Tue Feb 19 19:01:55 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.90:
+ Set locale and IBus envvars on startup for our children.
+ Remove background plugin, as background handling is now done in
gnome-shell.
+ A11y settings:
- Import GIO instead of GTK+/GDK.
- Do enable toolkit accessibility, even if we don't need it,
for the benefit of third-party/legacy toolkits and apps.
+ Cursor:
- Enable the on-screen keyboard when touch is used.
+ Keyboard:
- Adapt to gnome-xkb-info API change.
+ Media keys:
- Add other bindings to the whitelist.
+ Power:
- Make blanking timeouts match.
- Show notifications when about to suspend from idle.
- Wake up the display when about to logout.
- Adapt to new GnomeIdleMonitor API.
- Don't change the brightness on inactive sessions.
+ Remote Display:
- Disable animations on Xvnc as well.
- Re-enable animations if Vino is gone.
+ Sound:
- Avoid polling non-existent directories.
+ Updates:
- Fix crasher when firmware updates is disabled.
+ XSettings:
- propagate the remember-recent-files GSetting to XSettings.
+ Wacom:
- Bump req for GDK_FULLSCREEN_ON_ALL_MONITORS.
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
-------------------------------------------------------------------
Fri Feb 8 13:05:18 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.5.1:
+ Fix keyboard shortcut handling with XI 2.3.
-------------------------------------------------------------------
Tue Feb 5 19:12:46 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.5:
+ A11Y Keyboard:
- Disable everything on exit if no settings changed.
- Remove GTK+ fallback dialogues.
+ Color:
- Set the correct metadata on the auto-created EDID profile.
- Switching to a new account shouldn't warn.
+ Daemon:
- Also apply LC_PAPER.
+ Media Keys:
- Use D-Bus API to lock the screen.
- Use F20 for the temporary mic mute key.
+ Power:
- Add way to disable the backlight helper.
- Avoid dead-locking with gnome-shell on startup.
- Avoid possible crash when shutting down quickly or at
startup.
- Drop explicit screen locking on suspend.
- Fix incorrect backlight level on restore.
- Handle dim idle the same way as other idles.
- Lots of test additions.
- Wake up the display when unplugging the AC too.
+ Remote DIsplay:
- Detect SPICE sessions as well.
- Monitor Vino's Connected status.
+ Screenshot:
- Save to GtkRecentManager on success.
- Lots of test additions.
+ Updates:
- Allow the shell time to initialize before checking for
offline update failures.
+ Wacom:
- Use regular fullscreen window for OSD.
+ Updated translations.
- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
-------------------------------------------------------------------
Mon Jan 21 03:43:52 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.4:
+ Color:
- Addition to implement new mockups in gnome-control-center
+ Housekeeping:
- Fix purging not working
+ Keyboard:
- Don't migrate ibus xkb engines
+ Media-keys:
- Save screenshots without using gnome-screenshot
- Updated design for the on-screen OSD
- Show output device when changing the volume
- Add OSD support for the "Battery" key on certain laptops
- Add support for the microphone mute key on certain keyboards
- Move sound initialisation out of the critical startup path
+ Power:
- Add test suite
- Fix Power settings panel not picking up the updated
brightness
- Fix dimming of the screen not working, and don't dim when
inhibited
- Fix timeouts being longer than configured in some cases
- Aggressively blank the screen when the shield is down
- Update idle configuration when plugging or unplugging the
mains
- Really turn off the screen on suspend for MacBook laptops
- Allow overriding VM detection with the gnome.is_vm=[01]
kernel command-line parameter
+ Updates:
- Support notification filtering
+ Wacom:
- Fix problems resetting touch buttons on 64-bit systems
- Allow switching modes while OSD is active
+ XRandR:
- use default-monitors-setup for autoconfiguration even after
boot
+ Updated translations.
- Drop gnome-settings-daemon-double-suspend.patch: fixed upstream.
-------------------------------------------------------------------
Mon Jan 21 02:49:19 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.3:
+ Add implementation for Freedesktop.org ScreenSaver inhibition
API
+ Disable animations on slow links (VNC for example)
+ Remove fallback mode handling code
+ Disable the smartcard plugin for now
+ Cursor:
- Only show the cursor when the mouse gets used
+ Daemon:
- Many plugins ordering bug fixes
- Use gnome-session properties instead of libsystemd-login
- Allow whitelisting plugins, to make it easier for gdm to
catch up
- Install all the schemas, even the ones for which the plugins
aren't installed
- Add a way to replace the daemon
- exit gracefully if the session name is already taken
+ Housekeeping:
- Implement automatic purging of trash, along with a D-Bus
interface for it
+ Keyboard:
- Fix build without IBus
- Fix potential infinite loop due to num-lock handling
- Don't print warnings when calls are cancelled
- Handle keyboard shortcuts with Caps Lock for switching inputs
+ Media-keys:
- Use the shared libgnome-volume-control code
- Support launching gnome-calculator instead of gcalctool
- Add default shortcuts for the magnifier
- Add repeat to the brightness keys
+ Mouse:
- Fix natural horizontal scroll
+ Power:
- Remove unused settings keys
- Do not attempt to suspend, dim or blank if running inside a
VM
- Port to GnomeIdleMonitor from gnome-desktop
- Adjust sleep timer to blank timer in some cases
- Check if action is available before taking action
- Hide critical battery warning when power is plugged
- Fix possible race with gnome-shell on startup
+ Print-notifications:
- Don't show strange notifications when printing
+ Sound:
- Fix sound plugin never working properly
+ Updates:
- Fix warning on startup with PackageKit < 0.8.1
+ Wacom:
- Avoid infinite recursion with a non-Wacom display
- Fix handling of Cintiq 24HD mode-switch buttons
- Mode switch LED fixes for some tablets
- Add OSD help window (see gnome-control-center for how to
launch it)
+ XRandR:
- Add new follow-lid behavior and tie gsd-power lid-close to
XRandR
- Avoid crasher if XRandR calls fail on startup
- Fix the "rotate" button not working
- Swap axes for some (non-Wacom) tablets as well
- Add pkgconfig(librsvg-2.0) BuildRequires: new dependency for the
wacom plugin.
- Drop gnome-settings-daemon-build-without-ibus.patch: fixed
upstream.
- Rebase gnome-settings-daemon-bnc462640-mute-action.patch.
- Define with_smartcard, set to 0, to conditionally package the
smartcard plugin. Currently disabled, as it's broken.
-------------------------------------------------------------------
Mon Jan 21 01:31:29 UTC 2013 - dimstar@opensuse.org
- Add gnome-settings-daemon-build-without-ibus.patch: Fix build
without IBUS.
- Clean up the BUILD_FROM_VCS conditions.
-------------------------------------------------------------------
Mon Jan 21 00:50:01 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.1:
+ Daemon:
- Provide a singleton SessionManager proxy object
- Ensure session registration happens before other idles
- Use logind for suspending and rebooting the system
- Require logind for session tracking
+ Input:
- Clarify hotplug command exit value handling
- Add trackball detection
+ Keyboard:
- Add default ibus engine for Indic locales
- Don't apply global settings for every keyboard
+ Mouse:
- Re-enable touchpad when mouse isn't present
+ Power:
- Fix "no devices" error path in gsd-backlight-helper
- Add a watchdog to keep X's builtin screen saver disabled
- Fix a number of possible crashers
+ Wacom:
- Add support for touchstrips and touchrings without a
modeswitch
+ XSettings:
- Optimise xsettings changes.
- Change with_systemd defines to 1 in order to enable systemd.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 20 11:38:01 UTC 2013 - dimstar@opensuse.org Sun Jan 20 11:38:01 UTC 2013 - dimstar@opensuse.org

45
gnome-settings-daemon.spec
View File

@ -23,14 +23,17 @@
# We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet. # We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet.
%define with_ibus 0 %define with_ibus 0
# Smart-Card support is disabled in version 3.7.3
%define with_smartcard 0
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 3.6.3 Version: 3.8.0
Release: 0 Release: 0
Summary: Settings daemon for the GNOME desktop Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.6/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-settings-daemon/3.8/%{name}-%{version}.tar.xz
# PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff # PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
Patch2: gnome-settings-daemon-system-proxy-configuration.diff Patch2: gnome-settings-daemon-system-proxy-configuration.diff
# PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM) # PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM)
@ -45,9 +48,7 @@ Patch14: gnome-packagekit-fate302445.patch
Patch15: gnome-packagekit-BNC383261.patch Patch15: gnome-packagekit-BNC383261.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings
Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-double-suspend.patch bgo#680689 dimstar@opensuse.org -- Fix system suspending againt after waking up (fight with systemd) # PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch18: gnome-settings-daemon-double-suspend.patch
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch19: gnome-settings-daemon-notify-idle-resumed.patch Patch19: gnome-settings-daemon-notify-idle-resumed.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: fdupes BuildRequires: fdupes
@ -63,13 +64,10 @@ BuildRequires: polkit
BuildRequires: pkgconfig(colord) >= 0.1.12 BuildRequires: pkgconfig(colord) >= 0.1.12
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1
BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(glib-2.0) >= 2.35.3
%if 0%{?BUILD_FROM_VCS} BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90
BuildRequires: gnome-common BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.7.2.1
%endif BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.8
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.5.3
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.90
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.18
BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gudev-1.0)
%if %{with_ibus} %if %{with_ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
@ -78,12 +76,13 @@ BuildRequires: pkgconfig(kbproto)
BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libnotify) >= 0.7.3
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0
BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2
%if %{with_systemd} %if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libsystemd-login)
%endif %endif
BuildRequires: pkgconfig(libwacom) >= 0.6 BuildRequires: pkgconfig(libwacom) >= 0.7
BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(packagekit-glib2) >= 0.7.4 BuildRequires: pkgconfig(packagekit-glib2) >= 0.7.4
BuildRequires: pkgconfig(upower-glib) >= 0.9.11 BuildRequires: pkgconfig(upower-glib) >= 0.9.11
@ -131,7 +130,6 @@ contact the settings daemon via its DBus interface.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%if !0%{?BUILD_FROM_VCS}
# Disabled because of the non-rebased patches # Disabled because of the non-rebased patches
#gnome-patch-translation-prepare #gnome-patch-translation-prepare
#%%patch2 -p0 #%%patch2 -p0
@ -144,13 +142,7 @@ translation-update-upstream
# PATCH-NEEDS-REBASE # PATCH-NEEDS-REBASE
#%%patch15 -p0 #%%patch15 -p0
%patch17 -p1 %patch17 -p1
%patch18 -p1
%patch19 -p1 %patch19 -p1
%endif
%if 0%{?BUILD_FROM_VCS}
NOCONFIGURE=1 /usr/bin/gnome-autogen.sh
%endif
%build %build
autoreconf -f -i autoreconf -f -i
@ -176,7 +168,6 @@ make %{?jobs:-j%jobs} V=1
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif %endif
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%suse_update_desktop_file gnome-fallback-mount-helper
%suse_update_desktop_file gnome-settings-daemon %suse_update_desktop_file gnome-settings-daemon
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot} %fdupes %{buildroot}
@ -195,14 +186,12 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS %doc AUTHORS COPYING ChangeLog NEWS
%{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
%if %{with_ibus} %if %{with_ibus}
%{_datadir}/dbus-1/services/org.freedesktop.IBus.service %{_datadir}/dbus-1/services/org.freedesktop.IBus.service
%endif %endif
%{_datadir}/gnome-settings-daemon/ %{_datadir}/gnome-settings-daemon/
%{_datadir}/gnome-settings-daemon-3.0/ %{_datadir}/gnome-settings-daemon-3.0/
%dir %{_libexecdir}/gnome-settings-daemon-3.0/ %dir %{_libexecdir}/gnome-settings-daemon-3.0/
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-fallback-mount-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon %{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-input-sources-switcher %{_libexecdir}/gnome-settings-daemon-3.0/gsd-input-sources-switcher
@ -219,7 +208,6 @@ rm -rf %{buildroot}
# Explicitly list all the plugins so we know we don't lose any # Explicitly list all the plugins so we know we don't lose any
%{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
%{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so %{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
%{_libdir}/gnome-settings-daemon-3.0/libbackground.so
%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
%{_libdir}/gnome-settings-daemon-3.0/libcolor.so %{_libdir}/gnome-settings-daemon-3.0/libcolor.so
%{_libdir}/gnome-settings-daemon-3.0/libcursor.so %{_libdir}/gnome-settings-daemon-3.0/libcursor.so
@ -231,12 +219,15 @@ rm -rf %{buildroot}
%{_libdir}/gnome-settings-daemon-3.0/liborientation.so %{_libdir}/gnome-settings-daemon-3.0/liborientation.so
%{_libdir}/gnome-settings-daemon-3.0/libpower.so %{_libdir}/gnome-settings-daemon-3.0/libpower.so
%{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so %{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so
%{_libdir}/gnome-settings-daemon-3.0/libremote-display.so
%{_libdir}/gnome-settings-daemon-3.0/libscreensaver-proxy.so
%if %{with_smartcard}
%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
%endif
%{_libdir}/gnome-settings-daemon-3.0/libsound.so %{_libdir}/gnome-settings-daemon-3.0/libsound.so
%{_libdir}/gnome-settings-daemon-3.0/libupdates.so %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
%{_libdir}/gnome-settings-daemon-3.0/libxrandr.so %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
%{_libdir}/gnome-settings-daemon-3.0/libxsettings.so %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml