Accepting request 291567 from GNOME:Next

resub

OBS-URL: https://build.opensuse.org/request/show/291567
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=79

dconf.spec

@@ -17,16 +17,14 @@
 
 
 Name:           dconf
-Version:        0.22.0
+Version:        0.23.2
 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.22/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/dconf/0.23/%{name}-%{version}.tar.xz
 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.
-Patch0:         dconf-use-g_settings_get_default_value.patch
 # For directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  docbook-xsl-stylesheets
@@ -38,15 +36,12 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.39.1
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.4
-BuildRequires:  pkgconfig(libxml-2.0)
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gtk-doc
 %endif
 # dconf provides a dbus service, but has no dependency on dbus in any way
 # (because it uses gdbus), so we need an explicit Requires
 Requires:       dbus-1
-Recommends:     %{name}-lang
 
 %description
 dconf is a low-level configuration system. Its main purpose is to
@@ -93,19 +88,6 @@ have configuration storage systems.
 This package provides a GSettings backend that uses dconf to store
 the settings.
 
-%package editor
-Summary:        Simple key-based configuration system -- Graphical Editor
-Group:          System/GUI/GNOME
-Requires:       %{name} >= %{version}
-%glib2_gsettings_schema_requires
-
-%description editor
-dconf is a low-level configuration system. Its main purpose is to
-provide a backend to GSettings on platforms that don't already
-have configuration storage systems.
-
-This package provides a graphical editor for dconf database.
-
 %package devel
 Summary:        Simple key-based configuration system -- Development Files
 Group:          Development/Libraries/GNOME
@@ -126,10 +108,8 @@ dconf is a low-level configuration system. Its main purpose is to
 provide a backend to GSettings on platforms that don't already
 have configuration storage systems.
 
-%lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
@@ -146,9 +126,7 @@ have configuration storage systems.
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%suse_update_desktop_file %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor.desktop SystemSetup X-GNOME-PersonalSettings
 mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
-%find_lang %{name}
 
 %post -n libdconf1 -p /sbin/ldconfig
 
@@ -164,18 +142,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %postun -n gsettings-backend-dconf
 %glib2_gio_module_postun
 
-%post editor
-%desktop_database_post
-%icon_theme_cache_post
-%icon_theme_cache_post HighContrast
-%glib2_gsettings_schema_post
-
-%postun editor
-%desktop_database_postun
-%icon_theme_cache_postun
-%icon_theme_cache_postun HighContrast
-%glib2_gsettings_schema_postun
-
 %files
 %defattr(-, root, root)
 %doc COPYING NEWS
@@ -191,8 +157,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 # alternative databases
 %{_sysconfdir}/dconf/
 
-%files lang -f %{name}.lang
-
 %files -n libdconf1
 %defattr(-, root, root)
 %{_libdir}/libdconf.so.*
@@ -205,19 +169,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %defattr(-, root, root)
 %{_libdir}/gio/modules/libdconfsettings.so
 
-%files editor
-%defattr(-, root, root)
-%{_bindir}/dconf-editor
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml
-%{_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}/icons/hicolor/*/apps/dconf-editor.png
-%{_datadir}/icons/HighContrast/
-
-%{_mandir}/man1/dconf-editor.1%{?ext_man}
-
 %files devel
 %defattr(-, root, root)
 %doc %{_datadir}/gtk-doc/html/dconf/