[sks/el5: 23/23] Merge branch 'master' into el5

[Nick Bebout]

commit e7aa62e0a633c06fbdd0fce469a30f2800a13cd9
Merge: 8de44fa 3071742
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 11 16:29:50 2014 -0500

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

 .gitignore         |    3 +
 sks-build.patch    |   24 +++++
 sks-db.init        |  264 ++++++++++++++++++++++++---------------------------
 sks-db.service     |   10 ++
 sks-libdb5.2.patch |   13 +++
 sks-libdb5.3.patch |   13 +++
 sks-recon.init     |  261 ++++++++++++++++++++++++---------------------------
 sks-recon.service  |   12 +++
 sks.spec           |  159 ++++++++++++++++++++++++++-----
 sources            |    2 +-
 10 files changed, 454 insertions(+), 307 deletions(-)
---
diff --cc sks.spec
index 356019f,779b833..b83443c
--- a/sks.spec
+++ b/sks.spec
@@@ -5,51 -13,71 +13,86 @@@ Release:        6%{?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:        https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.5.tgz
+ %if 0%{?use_systemd}
  Source1:        sks-db.init
  Source2:        sks-recon.init
- Patch0:         sks-libdb4.8.patch
+ %else # 0%{?use_systemd}
+ %endif # 0%{?use_systemd}
+ Patch0:         sks-libdb5.3.patch
+ Patch1:         sks-build.patch
  #Patch1:		sks-1.1.1-bdb.patch
++<<<<<<< HEAD
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 +BuildRequires:  ocaml db4-devel zlib-devel chrpath
 +Requires(pre):    /usr/sbin/groupadd /usr/sbin/useradd
 +Requires(post):   /sbin/chkconfig
 +Requires(preun):  /sbin/chkconfig /sbin/service
 +Requires(postun): /sbin/service
- 
- # ocaml only available on these:
- ExclusiveArch: alpha armv4l %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
++=======
++>>>>>>> master
+ 
+ BuildRequires:  ocaml ocaml-camlp4-devel libdb-devel zlib-devel chrpath
+ %if 0%{?fedora} >= 19
+ BuildRequires: perl-podlators
+ %endif
+ %if 0%{?use_systemd}
+ BuildRequires: systemd-units
+ %endif
+ 
+ Requires:       libdb
+ Requires(pre):    /usr/sbin/groupadd /usr/sbin/useradd
+ %if 0%{?use_systemd}
+ Requires(post): systemd-units
+ Requires(post): systemd-sysv
+ Requires(preun): systemd-units
+ Requires(postun): systemd-units
+ %else # 0%{?use_systemd}
+ Requires(post): chkconfig
+ Requires(preun): chkconfig
+ # This is for /sbin/service
+ Requires(preun): initscripts
+ Requires(postun): initscripts
+ %endif # 0%{?use_systemd}
  
  %description
  SKS is a OpenPGP keyserver whose goal is to provide easy to
  deploy, decentralized, and highly reliable synchronization.
  
  %prep
- %setup -q -n sks
+ %setup -q
  %patch0 -p1
- #%patch1 -p1
+ %patch1 -p1
  
  %build
- %__mv Makefile.local.unused Makefile.local
- %__make dep
- %__make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all
+ mv Makefile.local.unused Makefile.local
+ make dep
+ make CFLAGS="$RPM_OPT_FLAGS -I`ocamlc -where` -I ." all
  
  %install
- %__rm -Rf "%{buildroot}"
- %__make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
+ make install PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
  chmod -x %{buildroot}%{_mandir}/man8/sks.8.gz
  chrpath --delete %{buildroot}%{_bindir}/sks
- install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/sks-db
- install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/sks-recon
  mkdir -p %{buildroot}%{_sbindir}
  for TYPE in db recon; do
-   %{__ln_s} %{_bindir}/%{name}  %{buildroot}%{_sbindir}/%{name}-${TYPE}
+   ln -s %{_bindir}/%{name}  %{buildroot}%{_sbindir}/%{name}-${TYPE}
  done
++<<<<<<< HEAD
 +
 +%clean
 +%__rm -Rf "%{buildroot}"
++=======
+ %if 0%{?use_systemd}
+ mkdir -p %buildroot%{_unitdir}
+ install -m 0644 %{SOURCE3} %buildroot%{_unitdir}/sks-db.service
+ install -m 0644 %{SOURCE4} %buildroot%{_unitdir}/sks-recon.service
+ %else # 0%{?use_systemd}
+ mkdir -p %buildroot%{_initrddir}
+ install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/sks-db
+ install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/sks-recon
+ %endif # 0%{?use_systemd}
++>>>>>>> master
  
  %pre
  if ! getent group  %{name} >/dev/null 2>&1; then