[opendnssec/f17] * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1 - Upgraded to 1.4.0b1 - EVR fix

[Paul Wouters]

commit 2f5090d8c1da253f2b6047dde65e8d92655e6ae8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Sep 26 22:25:52 2012 -0400

    * Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1
    - Upgraded to 1.4.0b1
    - EVR fix to the proper standard
    - Cleanup of spec file
    - Cron job to assist narrowing ods-enforcerd timing differences
    - Patch for NSEC3PARAM TTL
    - Patch to more aggressively try to resign

 .gitignore      |    1 +
 opendnssec.spec |   44 +++++++++++++++++++++++++++-----------------
 sources         |    1 +
 3 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6549ec..2df93c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /opendnssec-1.4.0a1.tar.gz
+/opendnssec-1.4.0b1.tar.gz
diff --git a/opendnssec.spec b/opendnssec.spec
index bd45c46..396bb47 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,28 +1,32 @@
+%global prever b1
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
-Release: 0.a1%{?dist}.3
+Release: 0.3.%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
-#Source: http://www.opendnssec.org/files/source/% {name}-% {version}a1.tar.gz
-Source: http://www.opendnssec.org/files/source/testing/%{name}-%{version}a1.tar.gz
+Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
 Source1: ods-enforcerd.service
 Source2: ods-signerd.service
 Source3: ods.sysconfig
 Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
-Source6: opendnssec-LICENSE
-Patch1: opendnssec-1.4.0a1-deleterr.patch
+Source6: opendnssec.cron
+Patch1: opendnssec-1.4.0a3-aggressive-retry.patch
+Patch2: opendnssec-1.4.0a3-nsec3param.patch
 Group: Applications/System
 Requires: opencryptoki, softhsm
 BuildRequires: systemd-units
 BuildRequires: ldns-devel >= 1.6.12, sqlite-devel , openssl-devel
 BuildRequires: libxml2-devel CUnit-devel, doxygen
 Requires(pre): shadow-utils
-Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+%if 0%{?prever:1}
+#For building snapshots
+Buildrequires: autoconf, automake, libtool, java
+%endif
 
 %description
 OpenDNSSEC was created as an open-source turn-key solution for DNSSEC.
@@ -30,13 +34,13 @@ It secures zone data just before it is published in an authoritative
 name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
-%setup -q -n %{name}-%{version}a1
-%patch1 -p1 -b .deleterr
+%setup -q -n %{name}-%{version}%{?prever}
+%patch1 -p1 -b .aggressive-retry
+%patch2 -p1 -b .nsec3param
 
 %build
 %configure --with-ldns=%{_libdir}
 make %{?_smp_mflags}
-cp %{SOURCE6} LICENSE
 
 %check
 # Requires sample db not shipped with upstream
@@ -46,8 +50,8 @@ cp %{SOURCE6} LICENSE
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/var/opendnssec/{tmp,signed,signconf}
-
-# cleanup sample files
+install -d -m 0755 %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/cron.d/
+install -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/cron.d/opendnssec
 rm -f %{buildroot}/%{_sysconfdir}/opendnssec/*.sample
 install -d -m 0755 %{buildroot}/%{_sysconfdir}/sysconfig 
 install -d -m 0755 %{buildroot}%{_unitdir}
@@ -55,13 +59,10 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
 install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/
 install -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ods
 install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/opendnssec/
-# Install tmpfiles.d config
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/opendnssec.conf
-
 mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -72,17 +73,18 @@ rm -rf %{buildroot}
 %attr(0750,root,ods) %dir %{_sysconfdir}/opendnssec
 %attr(0770,root,ods) %dir %{_localstatedir}/opendnssec
 %attr(0770,root,ods) %dir %{_localstatedir}/opendnssec/tmp
-%attr(0770,root,ods) %dir %{_localstatedir}/opendnssec/signed
+%attr(0775,root,ods) %dir %{_localstatedir}/opendnssec/signed
 %attr(0770,root,ods) %dir %{_localstatedir}/opendnssec/signconf
 %attr(0660,root,ods) %config(noreplace) %{_sysconfdir}/opendnssec/*.xml
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ods
 %attr(0770,root,ods) %dir %{_localstatedir}/run/opendnssec
+%attr(0644,root,root) %{_sysconfdir}/cron.d/opendnssec
 %doc NEWS README LICENSE
 %{_mandir}/*/*
 %{_sbindir}/*
 %{_bindir}/*
-%attr(0755,root,root) %dir %{_prefix}/share/%{name}
-%{_prefix}/share/%{name}/*
+%attr(0755,root,root) %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 
 %pre
 getent group ods >/dev/null || groupadd -r ods
@@ -119,6 +121,14 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.3.b1
+- Upgraded to 1.4.0b1
+- EVR fix to the proper standard
+- Cleanup of spec file
+- Cron job to assist narrowing ods-enforcerd timing differences
+- Patch for NSEC3PARAM TTL
+- Patch to more aggressively try to resign
+
 * Wed May 16 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.a1.3
 - Patch for crasher with deleted RRsets and NSEC3/OPTOUT chains
 - Remove EL5 required spec items (clean section, buildroot, etc)
diff --git a/sources b/sources
index e57d259..78313c5 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
+c5951e833a9414e3cbe575e7c66ee3ee  opendnssec-1.4.0b1.tar.gz