Merge remote-tracking branch 'origin/f17'

2012-03-21 00:44:18 +02:00 · 2012-03-21 00:44:18 +02:00 · 7ca78af553
commit 7ca78af553
parent 324fbba747 89c0292cbf
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ seahorse-2.30.0.tar.bz2
 /seahorse-3.3.3.tar.xz
 /seahorse-3.3.4.tar.xz
 /seahorse-3.3.5.tar.xz
+/seahorse-3.3.91.tar.xz
--- a/seahorse.spec
+++ b/seahorse.spec
@ -1,6 +1,6 @@
 Name:		seahorse
-Version:	3.3.5
-Release:	2%{?dist}
+Version:	3.3.91
+Release:	1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group:		User Interface/Desktops
 # seahorse is GPLv2+
@ -128,6 +128,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/*.gschema.xml

 %changelog
+* Thu Mar 15 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
 * Tue Feb 28 2012 Ray Strode <rstrode@redhat.com> 3.3.5-2
 - Drop fedora- vendor prefix

--- a/2
+++ b/2
@ -1 +1 @@
-8e78b8247686a9ecc4cfa4b2a6634940  seahorse-3.3.5.tar.xz
+dfcdc563fa969d8cc6765793ea89aada  seahorse-3.3.91.tar.xz