rpms/gnome-keyring/devel .cvsignore, 1.32, 1.33 gnome-keyring.spec, 1.61, 1.62 sources, 1.32, 1.33 gnome-keyring-2.20-add_new_keyrings.patch, 1.1, NONE gnome-keyring-2.20-link-against-pam.patch, 1.1, NONE gnome-keyring-2.20-no-unset-default.patch, 1.1, NONE gnome-keyring-2.20-no_match.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26191

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Removed Files:
	gnome-keyring-2.20-add_new_keyrings.patch 
	gnome-keyring-2.20-link-against-pam.patch 
	gnome-keyring-2.20-no-unset-default.patch 
	gnome-keyring-2.20-no_match.patch 
Log Message:
2.20.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	17 Sep 2007 18:39:17 -0000	1.32
+++ .cvsignore	15 Oct 2007 17:28:20 -0000	1.33
@@ -1 +1 @@
-gnome-keyring-2.20.tar.bz2
+gnome-keyring-2.20.1.tar.bz2


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-keyring.spec	9 Oct 2007 16:19:37 -0000	1.61
+++ gnome-keyring.spec	15 Oct 2007 17:28:20 -0000	1.62
@@ -2,8 +2,8 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 2.20
-Release: 6%{?dist}
+Version: 2.20.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.20/gnome-keyring-%{version}.tar.bz2
@@ -19,12 +19,8 @@
 BuildRequires: intltool
 BuildRequires: perl(XML::Parser)
 
-# Backport from svn
-Patch1:    gnome-keyring-2.20-add_new_keyrings.patch
-Patch2:    gnome-keyring-2.20-no-unset-default.patch
-Patch3:    gnome-keyring-2.20-no_match.patch
-Patch4:    gnome-keyring-2.20-selinux-pam.patch
-Patch5:	   gnome-keyring-2.20-link-against-pam.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=484612 
+Patch0:    gnome-keyring-2.20-selinux-pam.patch
 
 %description
 gnome-keyring manages passwords and other types of secrets
@@ -64,11 +60,7 @@
 %prep
 %setup -q -n gnome-keyring-%{version}
 
-%patch1 -p0 -b .add_new_keyrings
-%patch2 -p1 -b .no_unset_default
-%patch3 -p0 -b .no_match
-%patch4 -p1 -b .selinux_pam
-%patch5 -p1 -b .link-against-pam
+%patch0 -p1 -b .selinux_pam
 
 %build
 aclocal
@@ -115,6 +107,11 @@
 
 
 %changelog
+* Mon Oct 15 2007 Matthias Clasen  <mclasen at redhat.com> - 2.20.1-1
+- Update to 2.20.1
+- Drop obsolete patches
+- Add bug ref for selinux patch
+
 * Tue Oct  9 2007 Matthias Clasen  <mclasen at redhat.com> - 2.20-6
 - Avoid undefined symbols in the pam module
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 Sep 2007 18:39:17 -0000	1.32
+++ sources	15 Oct 2007 17:28:20 -0000	1.33
@@ -1 +1 @@
-f37c71974323cc79f59e274d97110047  gnome-keyring-2.20.tar.bz2
+16eb73c4a23db11ee8f20a731cf2a92b  gnome-keyring-2.20.1.tar.bz2


--- gnome-keyring-2.20-add_new_keyrings.patch DELETED ---


--- gnome-keyring-2.20-link-against-pam.patch DELETED ---


--- gnome-keyring-2.20-no-unset-default.patch DELETED ---


--- gnome-keyring-2.20-no_match.patch DELETED ---