From 2ed75c2afe8ea49693ed0a0eb543611ab5ab621b67647b461c0f2943f8518629 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 10:57:04 +0000 Subject: [PATCH] Accepting request 102984 from home:vuntz:branches:GNOME:Factory Update to 0.11.5 OBS-URL: https://build.opensuse.org/request/show/102984 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=38 --- dconf-0.11.2.tar.bz2 | 3 --- dconf-0.11.5.tar.xz | 3 +++ dconf.changes | 24 ++++++++++++++++++++++++ dconf.spec | 25 +++++++++---------------- 4 files changed, 36 insertions(+), 19 deletions(-) delete mode 100644 dconf-0.11.2.tar.bz2 create mode 100644 dconf-0.11.5.tar.xz diff --git a/dconf-0.11.2.tar.bz2 b/dconf-0.11.2.tar.bz2 deleted file mode 100644 index 5e40680..0000000 --- a/dconf-0.11.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8457a3806d8573a868bb118e17bc57d9c31b5532777e433fe5b1f49624737b03 -size 211229 diff --git a/dconf-0.11.5.tar.xz b/dconf-0.11.5.tar.xz new file mode 100644 index 0000000..9f6e1ab --- /dev/null +++ b/dconf-0.11.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f6ffd386b90e85791164794a66860aa16b7ff988f96105ea5ddc15808c776f5 +size 200620 diff --git a/dconf.changes b/dconf.changes index 8b3de14..85450e4 100644 --- a/dconf.changes +++ b/dconf.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Feb 7 08:28:10 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.11.5: + + Do not install non-standard icon sizes + + Fix a bug with getting default values when no profile is in use + + Some general code cleanups on the client side + + Improve Makefile compatibility: avoid using 'echo -e' +- Drop hack that removed installed icons with non-standard size: + fixed upstream. + +------------------------------------------------------------------- +Wed Feb 1 09:26:26 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.11.3: + + Require vala 0.15.1 + + Add icon for dconf-editor +- Call %icon_theme_cache_post(un) in %post/%postun of dconf-editor, + now that there is an icon. +- Drop hack in %install about the Icon key in dconf-editor.desktop: + there's an icon now. +- Remove installed icons that are using a non-standard size, to + avoid owning unneeded directories. + ------------------------------------------------------------------- Tue Nov 22 09:02:47 UTC 2011 - dimstar@opensuse.org diff --git a/dconf.spec b/dconf.spec index 37e01a0..4f35651 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,7 +1,7 @@ # # spec file for package dconf # -# 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 # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,19 @@ # - Name: dconf -Version: 0.11.2 -Release: 1 -# FIXME: remove sed hack to remove icon from desktop file when there's an icon in the tarball -License: LGPLv2.1+ +Version: 0.11.5 +Release: 0 Summary: Simple key-based configuration system +License: LGPL-2.1+ Group: System/Libraries Url: http://live.gnome.org/dconf -Source: http://download.gnome.org/sources/dconf/0.11/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/dconf/0.11/%{name}-%{version}.tar.xz Source99: baselibs.conf # For directory ownership BuildRequires: dbus-1 BuildRequires: update-desktop-files -BuildRequires: vala +BuildRequires: vala >= 0.15.1 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(gio-2.0) >= 2.29.90 BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -49,7 +47,6 @@ provide a backend to GSettings on platforms that don't already have configuration storage systems. %package -n libdconf0 -License: LGPLv2.1+ Summary: Simple key-based configuration system -- Library Group: System/Libraries # The library doesn't really work if the dconf service is not reachable, so we @@ -62,7 +59,6 @@ provide a backend to GSettings on platforms that don't already have configuration storage systems. %package -n libdconf-dbus-1-0 -License: LGPLv2.1+ Summary: Simple key-based configuration system -- Library for D-Bus Group: System/Libraries # The library doesn't really work if the dconf service is not reachable, so we @@ -75,7 +71,6 @@ provide a backend to GSettings on platforms that don't already have configuration storage systems. %package -n gsettings-backend-dconf -License: LGPLv2.1+ Summary: Simple key-based configuration system -- GSettings Backend Group: System/Libraries Requires: %{name} = %{version} @@ -92,7 +87,6 @@ This package provides a GSettings backend that uses dconf to store the settings. %package editor -License: LGPLv2.1+ Summary: Simple key-based configuration system -- Graphical Editor Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -106,7 +100,6 @@ have configuration storage systems. This package provides a graphical editor for dconf database. %package devel -License: LGPLv2.1+ Summary: Simple key-based configuration system -- Development Files Group: Development/Libraries/GNOME Requires: libdconf0 = %{version} @@ -117,7 +110,6 @@ provide a backend to GSettings on platforms that don't already have configuration storage systems. %package -n libdconf-dbus-devel -License: LGPLv2.1+ Summary: Simple key-based configuration system -- Development Files Group: Development/Libraries/GNOME Requires: libdconf-dbus-1-0 = %{version} @@ -146,8 +138,6 @@ have configuration storage systems. %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop SystemSetup -# FIXME: temporary hack to make the build not fail while we have no icon -sed -i "s/^Icon=dconf-editor/#Icon=dconf-editor/" %{buildroot}%{_datadir}/applications/dconf-editor.desktop mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %post -n libdconf0 -p /sbin/ldconfig @@ -166,10 +156,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %post editor %desktop_database_post +%icon_theme_cache_post %glib2_gsettings_schema_post %postun editor %desktop_database_postun +%icon_theme_cache_postun %glib2_gsettings_schema_postun %files @@ -203,6 +195,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db} %{_datadir}/applications/dconf-editor.desktop %{_datadir}/dconf-editor/ %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml +%{_datadir}/icons/hicolor/*/apps/dconf-editor.png %files devel %defattr(-, root, root)