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

[Nick Bebout]

commit 0627da9f0253f206fa7fd5e0228d3b06464f5bd1
Merge: 9c1bef0 ec3ca0e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 20 21:43:02 2013 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	sks.spec

 .gitignore         |    1 +
 sks-build.patch    |   16 ++++++++--------
 sks-libdb5.3.patch |   13 +++++++++++++
 sks.spec           |   45 ++++++++++++++++++++++++++++++++-------------
 sources            |    2 +-
 5 files changed, 55 insertions(+), 22 deletions(-)
---
diff --cc sks.spec
index 15a5405,35c26af..936d88e
--- a/sks.spec
+++ b/sks.spec
@@@ -6,15 -6,18 +6,22 @@@ License:        GPLv2
  Group:          System Environment/Daemons
  URL:            http://code.google.com/p/sks-keyserver/
  # hg clone https://code.google.com/r/johnclizbe-sks-keyserver/
- Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.3.tgz
+ Source0:        https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.4.tgz
  Source1:        sks-db.init
  Source2:        sks-recon.init
 +Patch0:         sks-libdb4.7.patch
 +Patch1:         sks-build.patch
 +#Patch1:		sks-1.1.1-bdb.patch
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 +BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath
 +Requires:       db4
+ Patch0:         sks-libdb5.3.patch
+ Patch1:         sks-build.patch
+ #Patch1:		sks-1.1.1-bdb.patch
+ 
 -BuildRequires:  ocaml ocaml-camlp4-devel libdb-devel zlib-devel chrpath
+ %if 0%{?fedora} >= 19
+ BuildRequires: perl-podlators
+ %endif
 -Requires:       libdb
  Requires(pre):    /usr/sbin/groupadd /usr/sbin/useradd
  Requires(post):   /sbin/chkconfig
  Requires(preun):  /sbin/chkconfig /sbin/service