[opendnssec/f20: 5/5] Merge branch 'master' into f20

[Paul Wouters]

commit 7e10d7089c0e1b199dddd3884747cd32ee4c1ccd
Merge: 4f0c2ad 53c15c3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Apr 18 17:04:55 2014 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	opendnssec.spec

 .gitignore                     |    1 +
 opendnssec-1.4.5-serial0.patch |   13 +++++++++++++
 opendnssec.spec                |   13 ++++++++++---
 sources                        |    2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)
---
diff --cc opendnssec.spec
index 78ce0ce,360ab93..73521d2
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@@ -14,9 -14,10 +14,11 @@@ Source3: ods.sysconfi
  Source4: conf.xml
  Source5: tmpfiles-opendnssec.conf
  Source6: opendnssec.cron
+ Patch1: opendnssec-1.4.5-serial0.patch
+ 
  Group: Applications/System
  Requires: opencryptoki, softhsm, systemd-units
 +BuildRequires: libxml2, libxslt
  Requires: libxml2, libxslt
  BuildRequires: ldns-devel >= 1.6.12, sqlite-devel , openssl-devel
  BuildRequires: libxml2-devel CUnit-devel, doxygen