diff --git a/.gitignore b/.gitignore index a85b0c4..e51367d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /opendnssec-1.4.0a1.tar.gz /opendnssec-1.4.0a2.tar.gz /opendnssec-1.4.0b1.tar.gz +/opendnssec-1.4.0b2.tar.gz diff --git a/opendnssec.spec b/opendnssec.spec index e45ec44..42151c4 100644 --- a/opendnssec.spec +++ b/opendnssec.spec @@ -2,7 +2,7 @@ Summary: DNSSEC key and zone management software Name: opendnssec Version: 1.4.0 -Release: 0.4.%{?prever}%{?dist} +Release: 0.5.%{?prever}%{?dist} License: BSD Url: http://www.opendnssec.org/ Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz @@ -12,9 +12,6 @@ Source3: ods.sysconfig Source4: conf.xml Source5: tmpfiles-opendnssec.conf Source6: opendnssec.cron -PAtch1: opendnssec-1.4.0a3-aggressive-retry.patch -Patch2: opendnssec-1.4.0a3-nsec3param.patch -Patch3: opendnssec-1.4.0b1-occluded.patch Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: opencryptoki, softhsm, systemd-units @@ -39,8 +36,6 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm %prep %setup -q -n %{name}-%{version}%{?prever} -%patch1 -p1 -b .aggressive-retry -%patch2 -p1 -b .nsec3param %build %configure --with-ldns=%{_libdir} @@ -117,6 +112,10 @@ fi %systemd_postun_with_restart ods-signerd.service %changelog +* Tue Dec 18 2012 Paul Wouters - 1.4.0-0.5.b2 +- Updated to 1.4.0b2 +- All patches have been merged upstream + * Tue Oct 30 2012 Paul Wouters - 1.4.0-0.4.b1 - Added BuildRequires: procps-ng for bug OPENDNSSEC-345 - Change RRSIG inception offset to -2h to avoid possible diff --git a/sources b/sources index bcdf49c..b7e3f52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5951e833a9414e3cbe575e7c66ee3ee opendnssec-1.4.0b1.tar.gz +17fd1b721fb568817be6866a82b19991 opendnssec-1.4.0b2.tar.gz