From d5e9ea6a7a726e53fc296a3299f850e1e99ab790ba3e5e1a8726cc10532c1e46 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 2 Sep 2011 16:12:12 +0000
Subject: [PATCH 1/2] Accepting request 80654 from
home:vuntz:branches:GNOME:Factory
Update to 3.1.90.1
OBS-URL: https://build.opensuse.org/request/show/80654
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=101
---
seahorse-3.1.4.tar.bz2 | 3 ---
seahorse-3.1.90.tar.bz2 | 3 +++
seahorse.changes | 23 +++++++++++++++++++++++
seahorse.spec | 30 +++++++++++++-----------------
4 files changed, 39 insertions(+), 20 deletions(-)
delete mode 100644 seahorse-3.1.4.tar.bz2
create mode 100644 seahorse-3.1.90.tar.bz2
diff --git a/seahorse-3.1.4.tar.bz2 b/seahorse-3.1.4.tar.bz2
deleted file mode 100644
index 3a0dc01..0000000
--- a/seahorse-3.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c26b5955ab9ea5546c071e429000fca26ffb66e343b1f1dd81f0f6203737e58
-size 2470900
diff --git a/seahorse-3.1.90.tar.bz2 b/seahorse-3.1.90.tar.bz2
new file mode 100644
index 0000000..93b21cb
--- /dev/null
+++ b/seahorse-3.1.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b106059842b8dc8286fd94736953ddc1045b296dc8c79d946c3752b88b195952
+size 2383376
diff --git a/seahorse.changes b/seahorse.changes
index 47338d8..b67965b 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Sep 1 13:48:16 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.90:
+ + Change application name to shorter 'Passwords and Keys'
+ + Fix drop downs in key generation dialogs
+ + Don't distribute internal libseahorse documentation
+ + Match changes in libgck and libgcr
+ + Remove old operation code, and replace with newer gio style
+ async
+ + Remove unused code and cleanup
+ + Port to GSettings (instead of using GConf)
+ + Add Glib style debug messages, activated with SEAHORSE_DEBUG=all
+ + Translation and build fixes
+- Remove pkgconfig(gconf-2.0) BuildRequires,
+ --disable-schemas-install from configure call and usage of gconf
+ macros; move to %glib2_gsettings_schema_* macros instead. This is
+ following the port to GSettings.
+- Update GenericName we set for seahorse.desktop to 'Passwords and
+ Keys', following upstream.
+- Remove hacky removal of libseahorse gtk-doc in %install now that
+ it is gone.
+
-------------------------------------------------------------------
Mon Jul 25 16:04:12 CEST 2011 - vuntz@opensuse.org
diff --git a/seahorse.spec b/seahorse.spec
index 05d8977..0e7fd79 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -21,7 +21,7 @@
Name: seahorse
License: GPLv2+
Group: Productivity/Security
-Version: 3.1.4
+Version: 3.1.90
Release: 1
Summary: GNOME interface for gnupg
Url: http://seahorse.sourceforge.net/
@@ -38,8 +38,7 @@ BuildRequires: update-desktop-files
BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(avahi-glib)
BuildRequires: pkgconfig(gck-1)
-BuildRequires: pkgconfig(gconf-2.0)
-BuildRequires: pkgconfig(gcr-3)
+BuildRequires: pkgconfig(gcr-3) >= 3.1.5
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-3.0)
@@ -47,7 +46,7 @@ BuildRequires: pkgconfig(libsoup-2.4)
Recommends: %{name}-lang
Obsoletes: %{name}-devel < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
%description
Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
@@ -59,8 +58,7 @@ translation-update-upstream
%build
%configure \
- --disable-scrollkeeper \
- --disable-schemas-install
+ --disable-scrollkeeper
make %{?jobs:-j%jobs} V=1
%install
@@ -69,31 +67,24 @@ make %{?jobs:-j%jobs} V=1
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%{__rm} -f %{buildroot}%{_libdir}/*.*a
-# there's no public libseahorse library, so we don't need the doc (bgo#655275)
-rm -r %{buildroot}%{_datadir}/gtk-doc/html/libseahorse/
-%suse_update_desktop_file -G "Passwords and Encryption Keys" -N "Seahorse" %{name}
+%suse_update_desktop_file -G "Passwords and Keys" -N "Seahorse" %{name}
%find_lang %{name} %{?no_lang_C}
-%find_gconf_schemas
%fdupes $RPM_BUILD_ROOT
-%pre -f %{name}.schemas_pre
-
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
%post
+%glib2_gsettings_schema_post
%desktop_database_post
%icon_theme_cache_post
%postun
+%glib2_gsettings_schema_postun
%desktop_database_postun
%icon_theme_cache_postun
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.schemas_list
+%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog ChangeLog.pre-auto NEWS README
%dir %{_datadir}/gnome/
@@ -106,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/seahorse
%{_libdir}/seahorse/
%{_datadir}/applications/seahorse.desktop
+%{_datadir}/GConf/gsettings/org.gnome.seahorse.convert
+%{_datadir}/GConf/gsettings/org.gnome.seahorse.manager.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.manager.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.window.gschema.xml
%{_datadir}/icons/hicolor/*/*/seahorse.png
%{_datadir}/icons/hicolor/*/*/seahorse-preferences.png
%{_datadir}/pixmaps/seahorse/
From c9e87763a1fd6c31900c235b8d0f0c68b1cb5f666ae5cf120eae1d8eca2e95dc Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 5 Sep 2011 08:14:24 +0000
Subject: [PATCH 2/2] Accepting request 80869 from
home:vuntz:branches:GNOME:Factory
Update to 3.1.91
OBS-URL: https://build.opensuse.org/request/show/80869
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=102
---
seahorse-3.1.90.tar.bz2 | 3 ---
seahorse-3.1.91.tar.bz2 | 3 +++
seahorse.changes | 9 +++++++++
seahorse.spec | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
delete mode 100644 seahorse-3.1.90.tar.bz2
create mode 100644 seahorse-3.1.91.tar.bz2
diff --git a/seahorse-3.1.90.tar.bz2 b/seahorse-3.1.90.tar.bz2
deleted file mode 100644
index 93b21cb..0000000
--- a/seahorse-3.1.90.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b106059842b8dc8286fd94736953ddc1045b296dc8c79d946c3752b88b195952
-size 2383376
diff --git a/seahorse-3.1.91.tar.bz2 b/seahorse-3.1.91.tar.bz2
new file mode 100644
index 0000000..2a31325
--- /dev/null
+++ b/seahorse-3.1.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cfa3a140b93f07c7b3db962af8049543b06eadc3b7128734cdd69a73eabfd87
+size 2379567
diff --git a/seahorse.changes b/seahorse.changes
index b67965b..1b82405 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep 5 06:30:47 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.91:
+ + Fix up for recent GTK+3 changes.
+ + Code cleanup, removing unused code.
+ + Remove old GTK+2 code that was missed earlier.
+ + Updated translations.
+
-------------------------------------------------------------------
Thu Sep 1 13:48:16 UTC 2011 - vuntz@opensuse.org
diff --git a/seahorse.spec b/seahorse.spec
index 0e7fd79..5c8b561 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -21,7 +21,7 @@
Name: seahorse
License: GPLv2+
Group: Productivity/Security
-Version: 3.1.90
+Version: 3.1.91
Release: 1
Summary: GNOME interface for gnupg
Url: http://seahorse.sourceforge.net/