From 95817abbdf14403d2550f018941d12ae792c2df8 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Aug 31 2011 19:51:58 +0000
Subject: Update to 3.1.90


- Remove and obsolete seahorse-devel -- libcryptui is now a separate
  package.
- Switch to gsettings and obsolete the gconf schema.

---

diff --git a/.gitignore b/.gitignore
index 7880c3f..c04a01f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ seahorse-2.30.0.tar.bz2
 /seahorse-3.0.1.tar.bz2
 /seahorse-3.1.1.tar.bz2
 /seahorse-3.1.4.tar.xz
+/seahorse-3.1.90.tar.xz
diff --git a/seahorse.spec b/seahorse.spec
index a7853c5..998b213 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,5 +1,5 @@
 Name:		seahorse
-Version:	3.1.4
+Version:	3.1.90
 Release:	1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group:		User Interface/Desktops
@@ -34,7 +34,6 @@ BuildRequires:  GConf2-devel
 # for g-ir-scanner
 BuildRequires:  libtool
 Requires(post): desktop-file-utils
-Requires(post): GConf2
 Requires(post): shared-mime-info
 Requires(post): /usr/bin/gtk-update-icon-cache
 Requires(postun): desktop-file-utils
@@ -46,6 +45,7 @@ Requires(postun): /usr/bin/gtk-update-icon-cache
 Requires:       pinentry-gui
 
 Obsoletes: gnome-keyring-manager
+Obsoletes: seahorse-devel < 3.1.4-2
 
 
 %description
@@ -54,23 +54,12 @@ It also integrates with nautilus, gedit and other places for encryption
 operations.  It is a keyring manager.
 
 
-%package devel
-Summary: Header files and libraries required to develop with seahorse
-Group: Development/Libraries
-Requires: pkgconfig >= 1:0.14
-Requires: %{name} = %{version}-%{release}
-Requires: gtk-doc
-
-%description devel
-The seahorse-devel package contains the header files for the libcryptui
-library that belongs to seahorse.
-
 %prep
 %setup -q
 
 
 %build
-GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper --with-gtk=3.0
+GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure --disable-scrollkeeper
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -81,13 +70,10 @@ make %{?_smp_mflags}
 find . -type f -name "*.c" -exec chmod a-x {} ';'
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 #mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
 #install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/seahorse-agent.sh
 
-
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang seahorse --with-gnome --all-name
 
 desktop-file-install --vendor fedora --delete-original  \
@@ -103,12 +89,11 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/icon-theme.cache
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
+%pre
+%gconf_schema_obsolete seahorse
+
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 \
-     --makefile-install-rule \
-     %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 update-mime-database %{_datadir}/mime/ > /dev/null
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@@ -121,10 +106,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null|| :
   gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -139,13 +127,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_mandir}/man1/*.gz
 %dir %{_libdir}/seahorse
 %{_libdir}/seahorse/*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*
-
-%files devel
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/libseahorse
+%{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
 
 %changelog
+* Wed Aug 31 2011 Kalev Lember <kalevlember@gmail.com> 3.1.90-1
+- Update to 3.1.90
+- Remove and obsolete seahorse-devel
+- Switch to gsettings and obsolete the gconf schema
+
 * Mon Jul 23 2011 Matthew Barnes <mbarnes@redhat.com> 3.1.4-1
 - Update to 3.1.4
 
diff --git a/sources b/sources
index ef5134e..867645e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28c9ff229e2e860147dc7be26923f2a8  seahorse-3.1.4.tar.xz
+6fd03522774ef250c30a5b13221f77d8  seahorse-3.1.90.tar.xz