[dconf/f22] Update to 0.23.1

[Kalev Lember]

commit 02edb78cbb57aeeefc26b25a9eddd2d6357fafb4
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Mar 2 22:23:18 2015 +0100

    Update to 0.23.1
    
    This drops the -editor subpackage which now lives in a separate
    dconf-editor SRPM.

 .gitignore |  1 +
 dconf.spec | 57 ++++++++++-----------------------------------------------
 sources    |  2 +-
 3 files changed, 12 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d5f71ea..281372e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ dconf-0.5.tar.bz2
 /dconf-0.20.0.tar.xz
 /dconf-0.21.0.tar.xz
 /dconf-0.22.0.tar.xz
+/dconf-0.23.1.tar.xz
diff --git a/dconf.spec b/dconf.spec
index 6f9e6a0..afa05c1 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -2,7 +2,7 @@
 %define vala_version 0.18.0
 
 Name:           dconf
-Version:        0.22.0
+Version:        0.23.1
 Release:        1%{?dist}
 Summary:        A configuration system
 
@@ -10,15 +10,13 @@ Group:          System Environment/Base
 License:        LGPLv2+ and GPLv2+ and GPLv3+
 URL:            http://live.gnome.org/dconf
 #VCS:           git:git://git.gnome.org/dconf
-Source0:        http://download.gnome.org/sources/dconf/0.22/dconf-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/dconf/0.23/dconf-%{version}.tar.xz
 
 BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  gtk3-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  dbus-devel
 BuildRequires:  vala-devel >= %{vala_version}
 BuildRequires:  gtk-doc
-BuildRequires:  intltool
 
 Requires:       dbus
 Requires:       glib2%{?_isa} >= %{glib2_version}
@@ -36,14 +34,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 dconf development package. Contains files needed for doing software
 development using dconf.
 
-%package editor
-Summary: Configuration editor for dconf
-Group:   Applications/System
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description editor
-dconf-editor allows you to browse and modify dconf databases.
-
 
 %prep
 %setup -q
@@ -59,7 +49,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile
 
-%find_lang dconf
+# https://bugzilla.gnome.org/show_bug.cgi?id=745484
+rm $RPM_BUILD_ROOT%{_mandir}/man1/dconf-editor.1*
 
 %post
 /sbin/ldconfig
@@ -76,30 +67,7 @@ fi
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
-%post editor
-for d in hicolor HighContrast ; do
-  touch --no-create %{_datadir}/icons/$d &>/dev/null || :
-done
-
-%postun editor
-if [ $1 -eq 0 ] ; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-  for d in hicolor HighContrast ; do
-    touch --no-create %{_datadir}/icons/$d &>/dev/null || :
-    gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || :
-  done
-fi
-
-%posttrans editor
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-for d in hicolor HighContrast ; do
-  gtk-update-icon-cache %{_datadir}/icons/$d &>/dev/null || :
-done
-
-
-%files -f dconf.lang
+%files
 %doc COPYING
 %dir %{_sysconfdir}/dconf
 %dir %{_sysconfdir}/dconf/db
@@ -125,17 +93,12 @@ done
 %{_datadir}/gtk-doc/html/dconf
 %{_datadir}/vala
 
-%files editor
-%{_bindir}/dconf-editor
-%{_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/*/apps/dconf-editor.png
-%{_mandir}/man1/dconf-editor.1.gz
-
 %changelog
+* Mon Mar 02 2015 Kalev Lember <kalevlember at gmail.com> - 0.23.1-1
+- Update to 0.23.1
+- This drops the -editor subpackage which now lives in a separate
+  dconf-editor SRPM.
+
 * Fri Sep 19 2014 Kalev Lember <kalevlember at gmail.com> - 0.22.0-1
 - Update to 0.22.0
 
diff --git a/sources b/sources
index 6bea9e1..281fb9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5459a539ffc483f9c002ddeab626a64e  dconf-0.22.0.tar.xz
+17f14dc4f00c071c1274908d03f4e168  dconf-0.23.1.tar.xz