Accepting request 99170 from GNOME:Factory
Fix 3.3.3.1 update to work OBS-URL: https://build.opensuse.org/request/show/99170 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=74
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
3c5f211007
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d982dcb144104b9b2ba5bcf0e976e3021ffff760e058cd6ab7a9f4c56afa83be
|
|
||||||
size 1792146
|
|
||||||
3
gnome-settings-daemon-3.3.3.1.tar.xz
Normal file
3
gnome-settings-daemon-3.3.3.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6ab326f4abfacd7e9a67380100b464eeaf0f23b6a99461122568e8e00f7f87ae
|
||||||
|
size 1444184
|
||||||
@ -2,15 +2,15 @@ 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
|
||||||
@@ -637,6 +637,7 @@ do_sound_action (GsdMediaKeysManager *ma
|
@@ -976,6 +976,7 @@ do_sound_action (GsdMediaKeysManager *ma
|
||||||
gboolean quiet)
|
|
||||||
{
|
{
|
||||||
|
GvcMixerStream *stream;
|
||||||
gboolean old_muted, new_muted;
|
gboolean old_muted, new_muted;
|
||||||
+ gboolean toggle_mute;
|
+ gboolean toggle_mute;
|
||||||
guint old_vol, new_vol, norm_vol_step;
|
guint old_vol, new_vol, norm_vol_step;
|
||||||
gboolean sound_changed;
|
gboolean sound_changed;
|
||||||
|
|
||||||
@@ -653,7 +654,11 @@ do_sound_action (GsdMediaKeysManager *ma
|
@@ -997,7 +998,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
|
||||||
@@ -66,6 +66,7 @@ volume-down = /apps/gnome_settings_daemo
|
@@ -61,6 +61,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,7 +39,7 @@ 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
|
||||||
@@ -145,5 +145,10 @@
|
@@ -155,6 +155,11 @@
|
||||||
<_summary>Magnifier zoom out</_summary>
|
<_summary>Magnifier zoom out</_summary>
|
||||||
<_description>Binding for the magnifier to zoom out</_description>
|
<_description>Binding for the magnifier to zoom out</_description>
|
||||||
</key>
|
</key>
|
||||||
@ -49,4 +49,5 @@ Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
|
|||||||
+ <_description>Toggle the sound mixer's mute status when then mute button is pressed.</_description>
|
+ <_description>Toggle the sound mixer's mute status when then mute button is pressed.</_description>
|
||||||
+ </key>
|
+ </key>
|
||||||
</schema>
|
</schema>
|
||||||
</schemalist>
|
|
||||||
|
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
|
||||||
|
|||||||
@ -1,10 +0,0 @@
|
|||||||
--- plugins/power/gsd-power-manager.c 2011-09-26 10:49:43.000000000 -0500
|
|
||||||
+++ plugins/power/gsd-power-manager.c.orig 2011-10-17 10:28:30.000000000 -0500
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <sys/wait.h>
|
|
||||||
#include <glib/gi18n.h>
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <libupower-glib/upower.h>
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
From 3b41d8d62ebef1070e4304ad40cf395d12834808 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Wed, 19 Oct 2011 12:46:18 +0000
|
|
||||||
Subject: media-keys: Fix the suspend key not working
|
|
||||||
|
|
||||||
We were trying to find UPower on the session bus instead of the
|
|
||||||
system bus.
|
|
||||||
|
|
||||||
Spotted by Sebastien Bacher <seb128@ubuntu.com>
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=660267#c3
|
|
||||||
---
|
|
||||||
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
|
|
||||||
index 7330591..e1b511e 100644
|
|
||||||
--- a/plugins/media-keys/gsd-media-keys-manager.c
|
|
||||||
+++ b/plugins/media-keys/gsd-media-keys-manager.c
|
|
||||||
@@ -2053,16 +2053,6 @@ on_bus_gotten (GObject *source_object,
|
|
||||||
NULL,
|
|
||||||
(GAsyncReadyCallback) power_keyboard_ready_cb,
|
|
||||||
manager);
|
|
||||||
-
|
|
||||||
- g_dbus_proxy_new (manager->priv->connection,
|
|
||||||
- G_DBUS_PROXY_FLAGS_NONE,
|
|
||||||
- NULL,
|
|
||||||
- "org.freedesktop.UPower",
|
|
||||||
- "/org/freedesktop/UPower",
|
|
||||||
- "org.freedesktop.UPower",
|
|
||||||
- NULL,
|
|
||||||
- (GAsyncReadyCallback) upower_ready_cb,
|
|
||||||
- manager);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -2076,6 +2066,16 @@ register_manager (GsdMediaKeysManager *manager)
|
|
||||||
manager->priv->bus_cancellable,
|
|
||||||
(GAsyncReadyCallback) on_bus_gotten,
|
|
||||||
manager);
|
|
||||||
+
|
|
||||||
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
|
|
||||||
+ G_DBUS_PROXY_FLAGS_NONE,
|
|
||||||
+ NULL,
|
|
||||||
+ "org.freedesktop.UPower",
|
|
||||||
+ "/org/freedesktop/UPower",
|
|
||||||
+ "org.freedesktop.UPower",
|
|
||||||
+ NULL,
|
|
||||||
+ (GAsyncReadyCallback) upower_ready_cb,
|
|
||||||
+ manager);
|
|
||||||
}
|
|
||||||
|
|
||||||
GsdMediaKeysManager *
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
||||||
@ -1,3 +1,176 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 5 14:42:14 UTC 2012 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Remove data/gnome-settings-daemon.desktop.in from tarball before
|
||||||
|
building since we need to generate it with the proper libexec
|
||||||
|
directory, else gnome-settings-daemon will never start properly.
|
||||||
|
See bgo#666772.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 5 08:03:19 UTC 2012 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.3.3.1:
|
||||||
|
+ Wacom:
|
||||||
|
- Fix referenced module name
|
||||||
|
- Changes from version 3.3.3:
|
||||||
|
+ Common:
|
||||||
|
- Remove unused X key event code
|
||||||
|
+ Wacom:
|
||||||
|
- Lots of infrastructure buildup that I can't really summarize
|
||||||
|
here
|
||||||
|
- Rename plugin to avoid name clash with libwacom
|
||||||
|
- Use libwacom to get tablet metadata
|
||||||
|
- Implement per-device and per-stylus settings
|
||||||
|
+ Power:
|
||||||
|
- Add the vendor name to the battery recall warning
|
||||||
|
(bgo#664418)
|
||||||
|
- Add automatic dimming of keyboard backlight
|
||||||
|
+ Print:
|
||||||
|
- Prevent crashes when cups sends malformed D-Bus signals
|
||||||
|
(bgo#665689)
|
||||||
|
+ XSettings:
|
||||||
|
- Set GtkShellShowsAppMenu xsetting when the shell is running
|
||||||
|
+ Updated translations.
|
||||||
|
- Add xz BuildRequires because we can't build a package for a
|
||||||
|
xz-compressed tarball without explicitly specifying that... See
|
||||||
|
bnc#697467 for more details.
|
||||||
|
- Add pkgconfig(libwacom) BuildRequires: new dependency upstream.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 21 18:38:24 UTC 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.3.2:
|
||||||
|
+ Common:
|
||||||
|
- Remove left-over debug (bgo#660073)
|
||||||
|
- Fix handling of <Primary>
|
||||||
|
- Update required gnome-desktop version
|
||||||
|
- Return opcode when detecting XInput2
|
||||||
|
- Add helper to get the input device node
|
||||||
|
- Use XInput2 to capture and match keys
|
||||||
|
- Use GTK+ functions instead of own impl (bgo#663343)
|
||||||
|
- Fix small memleak
|
||||||
|
- Allow to grab 'Print' without modifiers (bgo#663623)
|
||||||
|
- Require gsettings-desktop-schemas 3.3.0
|
||||||
|
+ A11y keyboard:
|
||||||
|
- Port to GSettings (bgo#631502)
|
||||||
|
+ Automount:
|
||||||
|
- Call bind_textdomain_codeset()
|
||||||
|
+ Color:
|
||||||
|
- Do not load all the color devices twice at startup
|
||||||
|
- Don't assign the same device more than once at startup
|
||||||
|
- Fix a crash if ~/.local is deleted at runtime (bgo#660664)
|
||||||
|
- Simplify gcm_profile_store_mkdir_with_parents()
|
||||||
|
- Cancel any in-progress directory searching on plugin unload
|
||||||
|
- Do not check for directory presence sync
|
||||||
|
- Fix critical warning if the user disables the internal LCD
|
||||||
|
screen
|
||||||
|
- Reset the gamma tables when the screen configuration changes
|
||||||
|
(bgo#660164)
|
||||||
|
- Unbreak loading profiles at startup (bgo#660790)
|
||||||
|
- Do not prefix the EDID profile title with 'Default'
|
||||||
|
- Set model and vendor to 'unknown' if not specified or
|
||||||
|
unavailable
|
||||||
|
+ Daemon:
|
||||||
|
- Create reference to a GnomePnpIds object to speed up loading
|
||||||
|
+ Datetime:
|
||||||
|
- Fix build requirements
|
||||||
|
+ Media keys:
|
||||||
|
- Use a GCancellable for g_bus_get calls so that they can be
|
||||||
|
cancelled
|
||||||
|
- Don't assert if the user sets the 'button-power' action to
|
||||||
|
'shutdown'
|
||||||
|
- Don't assert if the user sets the 'button-power' action to
|
||||||
|
'nothing'
|
||||||
|
- Only ever send signals to specific apps
|
||||||
|
- Document the MediaPlayerKeyPressed signal
|
||||||
|
- Add some D-Bus API documentation
|
||||||
|
- Fix OSD touchpad icon names (bgo#661179)
|
||||||
|
- Fix suspend button not locking the screen (bgo#660267)
|
||||||
|
- Fix the suspend key not working (bgo#660267)
|
||||||
|
- Remove unused allowed-keys entry
|
||||||
|
- Cache the volume change event sound
|
||||||
|
- Update for GVC API
|
||||||
|
- Print warning for real errors
|
||||||
|
- Apply volume on the device the key came from (bgo#340720)
|
||||||
|
- Add custom shortcut type
|
||||||
|
- Implement GConf keyboard shortcuts (bgo#625228)
|
||||||
|
- Redraw volume OSD when not composited (bgo#660990)
|
||||||
|
- Update for gsd-keygrab API change (bgo#663343)
|
||||||
|
- Move some metacity shortcuts into g-s-d (bgo#663623)
|
||||||
|
- Port custom keybindings to GSettings (bgo#631502)
|
||||||
|
+ Power:
|
||||||
|
- Use a GCancellable for g_bus_get calls so that they can be
|
||||||
|
cancelled
|
||||||
|
- Do not revert to the pre-idle brightness if idle dimming is
|
||||||
|
disabled (bgo#660434)
|
||||||
|
- Remove some unused schema for enabling the sleep-inactive
|
||||||
|
actions (bgo#660395)
|
||||||
|
- Clarify what a value of 0 is for sleep-inactive-x-timeout
|
||||||
|
- Do not sleep-on-idle by default
|
||||||
|
- Simplify hiding/showing the status icon
|
||||||
|
- Ensure the DPMS state is 'on' at startup (bgo#660482)
|
||||||
|
- Close low-battery notification when plugged in (bgo#660942)
|
||||||
|
- Remove the window filter when the plugin is unloaded
|
||||||
|
- Don't crash when setting the dim timeout when using NX
|
||||||
|
(bgo#661000)
|
||||||
|
- Call XSyncInitialize() in case GTK+ wasn't compiled with
|
||||||
|
XSync support
|
||||||
|
- Emit 'Changed' signal to all listeners
|
||||||
|
- Fix "undefined symbol: WEXITSTATUS" error (bgo#662020)
|
||||||
|
- Make non-urgent notifications transient (bgo#662711)
|
||||||
|
+ Printers:
|
||||||
|
- Fix build on systems without LC_PAPER (bgo#660626)
|
||||||
|
- Call setlocale() (bgo#660632)
|
||||||
|
- Exit gsd-printer when session ends (bgo#660158)
|
||||||
|
- Correct signature when calling PrinterAddOptionDefault
|
||||||
|
- Don't show "Not connected?" when not needed
|
||||||
|
- Unown name on the system bus when session goes idle
|
||||||
|
(bgo#660158)
|
||||||
|
- Set requesting-user-name when getting job info
|
||||||
|
- Show printer-state-reasons only when printing my jobs
|
||||||
|
- Don't allow "/" in printer name (bgo#661774)
|
||||||
|
- Make notifications resident
|
||||||
|
- Fix a leak
|
||||||
|
+ Xrandr:
|
||||||
|
- Use a GCancellable for g_bus_get calls so that they can be
|
||||||
|
cancelled
|
||||||
|
+ Xsettings:
|
||||||
|
- Remove workaround to deal with g-s-d not exiting correctly
|
||||||
|
- Plug mem leaks (bgo#663239)
|
||||||
|
+ Wacom:
|
||||||
|
- Fix possible crasher (bgo#661170)
|
||||||
|
- Set cursor devices to be in relative mode by default
|
||||||
|
(bgo#662977)
|
||||||
|
- Add classes to manage settings and properties
|
||||||
|
+ Updated translations.
|
||||||
|
- Rebase gnome-settings-daemon-bnc462640-mute-action.patch.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 15 10:37:55 UTC 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.2.2:
|
||||||
|
+ Fix a number of memory leaks and static analysis bugs
|
||||||
|
+ Media keys:
|
||||||
|
- Fix suspend key not working
|
||||||
|
- Fix newly captured keybindings with GTK+ 3.2.1 not working
|
||||||
|
('<Primary>' key)
|
||||||
|
- Fix OSD display problem in fallback mode
|
||||||
|
- Allow grabbing the Print key without a modifier
|
||||||
|
+ Power:
|
||||||
|
- Fix possible undefined symbol
|
||||||
|
+ Printers:
|
||||||
|
- Fix crash on start when registering a D-Bus service
|
||||||
|
- Fix problems getting ownership information for print jobs
|
||||||
|
- Only show errors when the print job triggering it is ours
|
||||||
|
- Make error notifications resident, and dismiss them when
|
||||||
|
the problem is resolved
|
||||||
|
+ Wacom:
|
||||||
|
- Set cursor devices to be in relative mode by default
|
||||||
|
- Drop gnome-settings-daemon-upower-system-bus.patch: fixed
|
||||||
|
upstream.
|
||||||
|
- Drop gnome-settings-daemon-fix-missing-wexitstatus.patch: fixed
|
||||||
|
upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 2 15:50:48 UTC 2011 - rbrownccb@opensuse.org
|
Wed Nov 2 15:50:48 UTC 2011 - rbrownccb@opensuse.org
|
||||||
|
|
||||||
@ -1551,7 +1724,7 @@ Tue Feb 19 23:28:50 CET 2008 - maw@suse.de
|
|||||||
- Update to version 2.21.91:
|
- Update to version 2.21.91:
|
||||||
+ Use a flat directory instead of a hierarchy to install plugins
|
+ Use a flat directory instead of a hierarchy to install plugins
|
||||||
into (bgo#513246)
|
into (bgo#513246)
|
||||||
+ Don't scan the plugins directory recursively (#513246)
|
+ Don't scan the plugins directory recursively (bgo#513246)
|
||||||
+ Install the settings plugin to a versioned directory to fix install
|
+ Install the settings plugin to a versioned directory to fix install
|
||||||
with libdir == libexecdir (bgo#504203)
|
with libdir == libexecdir (bgo#504203)
|
||||||
+ Review short and long descriptions for GConf keys (bgo#514047)
|
+ Review short and long descriptions for GConf keys (bgo#514047)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package gnome-settings-daemon
|
# spec file for package gnome-settings-daemon
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,15 +16,15 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Name: gnome-settings-daemon
|
Name: gnome-settings-daemon
|
||||||
Version: 3.2.1
|
Version: 3.3.3.1
|
||||||
Release: 1
|
Release: 0
|
||||||
License: GPLv2+
|
# FIXME: on update to 3.3.4, hack removing .desktop.in in %%setup can be removed
|
||||||
Summary: Settings daemon for the GNOME desktop
|
Summary: Settings daemon for the GNOME desktop
|
||||||
Url: http://www.gnome.org
|
License: GPL-2.0+
|
||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.2/%{name}-%{version}.tar.bz2
|
Url: http://www.gnome.org
|
||||||
|
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.3/%{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)
|
||||||
@ -41,10 +41,6 @@ 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-fix-missing-wexitstatus.patch bgo#662020 malcolmlewis@opensuse.org -- Add missing include that can cause issues at runtime, especially on 11.4.
|
|
||||||
Patch18: gnome-settings-daemon-fix-missing-wexitstatus.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-upower-system-bus.patch bgo#660267 rbrownccb@opensuse.org -- Make g-s-d look for UPower on system bus to fix suspend button
|
|
||||||
Patch19: gnome-settings-daemon-upower-system-bus.patch
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gnome-common
|
BuildRequires: gnome-common
|
||||||
# Disabled because of the non-rebased patches
|
# Disabled because of the non-rebased patches
|
||||||
@ -53,6 +49,8 @@ BuildRequires: intltool
|
|||||||
BuildRequires: translation-update-upstream
|
BuildRequires: translation-update-upstream
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
|
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
|
||||||
|
BuildRequires: xz
|
||||||
BuildRequires: pkgconfig(colord) >= 0.1.12
|
BuildRequires: pkgconfig(colord) >= 0.1.12
|
||||||
BuildRequires: pkgconfig(dbus-glib-1) >= 0.7.4
|
BuildRequires: pkgconfig(dbus-glib-1) >= 0.7.4
|
||||||
BuildRequires: pkgconfig(fontconfig)
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
@ -62,8 +60,8 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.29.14
|
|||||||
BuildRequires: gnome-common
|
BuildRequires: gnome-common
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.5
|
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.5
|
||||||
BuildRequires: pkgconfig(gsettings-desktop-schemas)
|
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 2.99.3
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.4
|
||||||
BuildRequires: pkgconfig(gudev-1.0)
|
BuildRequires: pkgconfig(gudev-1.0)
|
||||||
BuildRequires: pkgconfig(kbproto)
|
BuildRequires: pkgconfig(kbproto)
|
||||||
BuildRequires: pkgconfig(lcms2)
|
BuildRequires: pkgconfig(lcms2)
|
||||||
@ -72,6 +70,7 @@ BuildRequires: pkgconfig(libgnomekbd)
|
|||||||
BuildRequires: pkgconfig(libgnomekbdui)
|
BuildRequires: pkgconfig(libgnomekbdui)
|
||||||
BuildRequires: pkgconfig(libnotify) >= 0.7.3
|
BuildRequires: pkgconfig(libnotify) >= 0.7.3
|
||||||
BuildRequires: pkgconfig(libpulse)
|
BuildRequires: pkgconfig(libpulse)
|
||||||
|
BuildRequires: pkgconfig(libwacom)
|
||||||
BuildRequires: pkgconfig(libxklavier)
|
BuildRequires: pkgconfig(libxklavier)
|
||||||
BuildRequires: pkgconfig(nss)
|
BuildRequires: pkgconfig(nss)
|
||||||
BuildRequires: pkgconfig(packagekit-glib2) >= 0.6.12
|
BuildRequires: pkgconfig(packagekit-glib2) >= 0.6.12
|
||||||
@ -102,7 +101,6 @@ This module was previously part of GNOME Control Center, but has been
|
|||||||
splitted from it for a more general use.
|
splitted from it for a more general use.
|
||||||
|
|
||||||
%package polkit-datetime
|
%package polkit-datetime
|
||||||
License: GPLv2+
|
|
||||||
Summary: PolicyKit helper to set the system date and time
|
Summary: PolicyKit helper to set the system date and time
|
||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Requires: timezone
|
Requires: timezone
|
||||||
@ -112,7 +110,6 @@ This package contains a PolicyKit helper to set the system date and
|
|||||||
time.
|
time.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: GPLv2+
|
|
||||||
Summary: Development package for the GNOME settings daemon
|
Summary: Development package for the GNOME settings daemon
|
||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
@ -130,6 +127,8 @@ contact the settings daemon via its DBus interface.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
|
# Hack, see bgo#666772
|
||||||
|
rm data/gnome-settings-daemon.desktop.in
|
||||||
%if !0%{?BUILD_FROM_VCS}
|
%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
|
||||||
@ -146,8 +145,6 @@ translation-update-upstream
|
|||||||
#%%patch15 -p0
|
#%%patch15 -p0
|
||||||
%patch17 -p1
|
%patch17 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch18
|
|
||||||
%patch19 -p1
|
|
||||||
|
|
||||||
%if 0%{?BUILD_FROM_VCS}
|
%if 0%{?BUILD_FROM_VCS}
|
||||||
NOCONFIGURE=1 /usr/bin/gnome-autogen.sh
|
NOCONFIGURE=1 /usr/bin/gnome-autogen.sh
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user