From 4c34cc69e5c3763ccc58e880f927cb3fbc3df5bbc11581a78926e29002027630 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 15 Aug 2011 18:06:43 +0000
Subject: [PATCH] Accepting request 78968 from home:dimstar:branches:GNOME:Apps

Update to 2.90.1

OBS-URL: https://build.opensuse.org/request/show/78968
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/ghex?expand=0&rev=7
---
 ghex-2.90.0.tar.bz2 |  3 ---
 ghex-2.90.1.tar.bz2 |  3 +++
 ghex.changes        | 13 +++++++++++++
 ghex.spec           | 20 +++++++++-----------
 4 files changed, 25 insertions(+), 14 deletions(-)
 delete mode 100644 ghex-2.90.0.tar.bz2
 create mode 100644 ghex-2.90.1.tar.bz2

diff --git a/ghex-2.90.0.tar.bz2 b/ghex-2.90.0.tar.bz2
deleted file mode 100644
index 0ecbee3..0000000
--- a/ghex-2.90.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a73b05cedca2c4a4271de72666ce0df2cb6af87e2a844bda5c7fe7a7960909d
-size 1484215
diff --git a/ghex-2.90.1.tar.bz2 b/ghex-2.90.1.tar.bz2
new file mode 100644
index 0000000..1f861e0
--- /dev/null
+++ b/ghex-2.90.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4effb2370e9614367f6d0353c10ff9c0b972e7e902345e28a4e70ab694e8b1d9
+size 1487442
diff --git a/ghex.changes b/ghex.changes
index e2c4a3c..8067c0b 100644
--- a/ghex.changes
+++ b/ghex.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 15 19:37:07 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 2.90.1:
+  + Port from GConf to GSettings
+  + Scrolling code cleanup
+  + Moved internal pkgconfig dependencies to Requires.private
+  + Bugs fixed: bgo#656080, bgo#655973, bgo#572697.
+  + Updated translations.
+- Drop pkgconfig(gconf-2.0) BuildRequires, as the code has been
+  ported to GSettings.
+- Replace the gconf schema handling with gsettings one.
+
 -------------------------------------------------------------------
 Fri Aug  5 20:51:00 CEST 2011 - dimstar@opensuse.org
 
diff --git a/ghex.spec b/ghex.spec
index 33ccd4a..9a77b95 100644
--- a/ghex.spec
+++ b/ghex.spec
@@ -18,7 +18,7 @@
 
 
 Name:           ghex
-Version:        2.90.0
+Version:        2.90.1
 Release:        1
 License:        GPLv2+
 Summary:        GNOME Binary Editor
@@ -32,14 +32,13 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(atk) >= 1.0.0
 BuildRequires:  pkgconfig(gail-3.0)
-BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 GHex allows the user to load data from any file and to view and edit it
@@ -85,40 +84,39 @@ mv %{buildroot}%{_datadir}/applications/ghex.desktop.new \
 mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin
 %find_lang %{name}-3.0 %{?no_lang_C}
 %find_lang %{name} ghex-3.0.lang %{?no_lang_C}
-%find_gconf_schemas
 %fdupes -s %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
-
 %post
 /sbin/ldconfig
 %if 0%{?suse_version} > 1130
 %desktop_database_post
 %icon_theme_cache_post
+%glib2_gsettings_schema_post
 %endif
 
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
 %postun
 /sbin/ldconfig
 %if 0%{?suse_version} > 1130
 %desktop_database_postun
 %icon_theme_cache_postun
+%glib2_gsettings_schema_postun
 %endif
 
 %files lang -f %{name}-3.0.lang
 
-%files -f %{name}.schemas_list
+%files
 %defattr(-,root,root)
 %doc README COPYING COPYING-DOCS AUTHORS
 %{_bindir}/ghex
 %{_libdir}/libgtkhex-3.so.*
 %{_datadir}/applications/ghex.desktop
+%dir %{_datadir}/GConf
+%dir %{_datadir}/GConf/gsettings
+%{_datadir}/GConf/gsettings/ghex.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/ghex.*
 %{_datadir}/%{name}/
 %dir %{_datadir}/gnome/help/%{name}