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

[Nick Bebout]

commit f1a63bc18bcafe98df1bb41f4fd4e85686681ab7
Merge: 981a003 3071742
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 11 16:29:31 2014 -0500

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

 sks-db.service    |   10 ++++++
 sks-recon.service |   12 +++++++
 sks.spec          |   92 +++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 97 insertions(+), 17 deletions(-)
---
diff --cc sks.spec
index a350608,779b833..d138448
--- a/sks.spec
+++ b/sks.spec
@@@ -7,15 -15,16 +15,18 @@@ Group:          System Environment/Daem
  URL:            http://code.google.com/p/sks-keyserver/
  # hg clone https://code.google.com/r/johnclizbe-sks-keyserver/
  Source0:        https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.5.tgz
+ %if 0%{?use_systemd}
  Source1:        sks-db.init
  Source2:        sks-recon.init
+ %else # 0%{?use_systemd}
+ %endif # 0%{?use_systemd}
 -Patch0:         sks-libdb5.3.patch
 +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
  
 -BuildRequires:  ocaml ocaml-camlp4-devel libdb-devel zlib-devel chrpath
  %if 0%{?fedora} >= 19
  BuildRequires: perl-podlators
  %endif