[sks/el6: 2/2] Merge branch 'master' into el6

[Nick Bebout]

commit 9c1bef0a80bd1231edbab44d6f644556d74fe29e
Merge: edba0fb 78a4d53
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Apr 21 17:01:19 2012 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 sks.spec   |   10 ++++++----
 sources    |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc sks.spec
index bc5c73d,c4995f4..15a5405
--- a/sks.spec
+++ b/sks.spec
@@@ -5,12 -5,11 +5,11 @@@ Release:        1%{?dist
  License:        GPLv2+
  Group:          System Environment/Daemons
  URL:            http://code.google.com/p/sks-keyserver/
- #Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.2.tgz
  # hg clone https://code.google.com/r/johnclizbe-sks-keyserver/
- Source0:        sks.tar.bz2
+ Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.3.tgz
  Source1:        sks-db.init
  Source2:        sks-recon.init
 -Patch0:         sks-libdb5.2.patch
 +Patch0:         sks-libdb4.7.patch
  Patch1:         sks-build.patch
  #Patch1:		sks-1.1.1-bdb.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root