Accepting request 252141 from GNOME:Factory

Push GNOME 3.14.0 (forwarded request 251854 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/252141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dconf?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2014-09-30 17:39:32 +00:00 committed by Git OBS Bridge
commit 00c88a625f
4 changed files with 28 additions and 8 deletions

View File

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

3
dconf-0.22.0.tar.xz Normal file
View File

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

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Sep 20 08:25:01 UTC 2014 - zaitor@opensuse.org
- Update to version 0.22.0:
+ Fix handling of floating point keys in editor.
+ Update appdata for renamed desktop file.
+ Minor doap changes.
+ Updated translations.
-------------------------------------------------------------------
Tue Aug 5 20:04:07 UTC 2014 - dimstar@opensuse.org
- Update to version 0.21.0:
+ Editor desktop file renamed to ca.desrt.dconf-editor to take
advantage of D-Bus activation.
+ Prevent the service from being released more than once if we
receive multiple signals.
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 5 20:04:06 UTC 2014 - dimstar@opensuse.org Tue Aug 5 20:04:06 UTC 2014 - dimstar@opensuse.org

View File

@ -17,13 +17,13 @@
Name: dconf Name: dconf
Version: 0.20.0 Version: 0.22.0
Release: 0 Release: 0
Summary: Simple key-based configuration system Summary: Simple key-based configuration system
License: LGPL-2.1+ License: LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Url: http://live.gnome.org/dconf Url: http://live.gnome.org/dconf
Source: http://download.gnome.org/sources/dconf/0.20/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/dconf/0.22/%{name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM dconf-use-g_settings_get_default_value.patch bnc#873225 bgo#668234 mgorse@suse.com -- Have editor display correct default value when an administrator has a custom database. # PATCH-FIX-UPSTREAM dconf-use-g_settings_get_default_value.patch bnc#873225 bgo#668234 mgorse@suse.com -- Have editor display correct default value when an administrator has a custom database.
Patch0: dconf-use-g_settings_get_default_value.patch Patch0: dconf-use-g_settings_get_default_value.patch
@ -146,7 +146,7 @@ have configuration storage systems.
%install %install
%makeinstall %makeinstall
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop SystemSetup X-GNOME-SystemSettings %suse_update_desktop_file %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop SystemSetup X-GNOME-SystemSettings
mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
%find_lang %{name} %find_lang %{name}
@ -191,7 +191,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
# alternative databases # alternative databases
%{_sysconfdir}/dconf/ %{_sysconfdir}/dconf/
%dir %{_datadir}/appdata %dir %{_datadir}/appdata
%{_datadir}/appdata/dconf-editor.appdata.xml %{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml
%files lang -f %{name}.lang %files lang -f %{name}.lang
@ -210,7 +210,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
%files editor %files editor
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/dconf-editor %{_bindir}/dconf-editor
%{_datadir}/applications/dconf-editor.desktop %{_datadir}/applications/ca.desrt.dconf-editor.desktop
%{_datadir}/dbus-1/services/ca.desrt.dconf-editor.service
%{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml
%{_datadir}/icons/hicolor/*/apps/dconf-editor.png %{_datadir}/icons/hicolor/*/apps/dconf-editor.png
%{_datadir}/icons/HighContrast/ %{_datadir}/icons/HighContrast/