Accepting request 99058 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99058
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsettings-desktop-schemas?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2012-01-06 10:44:40 +00:00 committed by Git OBS Bridge
commit 4fc93afbac
5 changed files with 29 additions and 35 deletions

View File

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

View File

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

View File

@ -1,25 +0,0 @@
commit 96bf58048800f1336aa8424c475f951702ce4858
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon Oct 3 15:56:46 2011 -0400
media: change x-content/software to x-content/unix-software
The Nautilus handler doesn't claim x-content/software at all now, and
we're really interested in autorunning UNIX software rather than Win32
one anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=660803
diff --git a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
index a1bd398..1df7aea 100644
--- a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
@@ -16,7 +16,7 @@
<_description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted.</_description>
</key>
<key name="autorun-x-content-start-app" type="as">
- <default>[ 'x-content/software' ]</default>
+ <default>[ 'x-content/unix-software' ]</default>
<_summary>List of x-content/* types where the preferred application will be launched</_summary>
<_description>List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types.</_description>
</key>

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Nov 26 13:06:51 UTC 2011 - dimstar@opensuse.org
- Add gobject-introspection-devel BuildRequires in order to get
GDEsktopEnums-3.0.gir built, which is needed by mutter 3.3.2 now.
- Stop building package as noarch: the resulting typelib file are
arch dependent.
-------------------------------------------------------------------
Tue Nov 22 21:53:25 UTC 2011 - dimstar@opensuse.org
- Update to version 3.3.2:
+ Add shared wm schemas
+ Updated translations.
- Drop gsettings-desktop-schemas-x-content-software.patch: fixed
upstream.
-------------------------------------------------------------------
Mon Oct 24 11:44:38 UTC 2011 - vuntz@opensuse.org

View File

@ -19,16 +19,15 @@
Name: gsettings-desktop-schemas
Version: 3.2.0
Version: 3.3.2
Release: 1
License: LGPLv2+
Summary: Shared GSettings Schemas for the Desktop
Url: http://gnome.org/
Group: System/GUI/GNOME
Source0: http://download.gnome.org/sources/gsettings-desktop-schemas/3.2/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gsettings-desktop-schemas-x-content-software.patch vuntz@opensuse.org -- Fix autostart for media containing software
Patch0: gsettings-desktop-schemas-x-content-software.patch
BuildRequires: glib2-devel
Source0: http://download.gnome.org/sources/gsettings-desktop-schemas/3.3/%{name}-%{version}.tar.bz2
BuildRequires: glib2-devel >= 2.31.0
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
%if 0%{?BUILD_FROM_VCS}
BuildRequires: gnome-common
@ -37,7 +36,6 @@ Recommends: %{name}-lang
# default font in the schemas
Recommends: cantarell-fonts
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%glib2_gsettings_schema_requires
%description
@ -59,7 +57,6 @@ This package contains development files.
%lang_package
%prep
%setup -q
%patch0 -p1
%if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
@ -100,16 +97,21 @@ rm -rf %{buildroot}
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.sound.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.thumbnailers.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.wm.keybindings.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.system.locale.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.system.proxy.gschema.xml
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert
%{_datadir}/GConf/gsettings/wm-schemas.convert
%{_libdir}/girepository-1.0/GDesktopEnums-3.0.typelib
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}/
%{_datadir}/pkgconfig/%{name}.pc
%{_datadir}/gir-1.0/GDesktopEnums-3.0.gir
%files lang -f %{name}.lang