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

[Nick Bebout]

commit 982f2335672f26ea0fbbb2b83ed21375ba748df5
Merge: f1a63bc 54fe045
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 11 16:52:31 2014 -0500

    Merge branch 'master' into el6

 sks.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --cc sks.spec
index d138448,73ddfb0..651b12c
--- a/sks.spec
+++ b/sks.spec
@@@ -16,17 -16,17 +16,19 @@@ URL:            http://code.google.com/
  # 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.service
+ Source2:        sks-recon.service
+ %else # 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