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

[Nick Bebout]

commit 84d2eeee762316a1378c458838d842b9b52b6708
Merge: 11cb20c 863ce16
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 21:01:28 2012 -0600

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

 .gitignore         |    3 +-
 sks-db.init        |  141 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sks-libdb4.8.patch |   13 +++++
 sks-recon.init     |  142 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 sks.spec           |  100 ++++++++++++++++++++++++++++++++++---
 sources            |    2 +-
 6 files changed, 392 insertions(+), 9 deletions(-)
---
diff --cc sks.spec
index dca6087,d51fcff..424eeeb
--- a/sks.spec
+++ b/sks.spec
@@@ -30,7 -41,14 +41,13 @@@ deploy, decentralized, and highly relia
  %__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}
+ done
  
 -
  %clean
  %__rm -Rf "%{buildroot}"