[opendnssec/el6] * Bump to fix EVR
Paul Wouters
pwouters at fedoraproject.org
Wed Sep 26 20:35:03 UTC 2012
commit 424a1e1c0277768916398c7df90a6cb07c58a95b
Author: Paul Wouters <pwouters at redhat.com>
Date: Wed Sep 26 14:00:48 2012 -0400
* Bump to fix EVR
Conflicts:
opendnssec.spec
opendnssec.spec | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/opendnssec.spec b/opendnssec.spec
index 2ae8606..7678386 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,12 +1,11 @@
+%global prever b1
Summary: DNSSEC key and zone management software for CIRA
Name: opendnssec
-Epoch: 10
Version: 1.4.0
-Release: 0.b1%{?dist}.1
+Release: 0.2.%{?prever}%{?dist}
License: BSD
Url: http://www.opendnssec.org/
-#Source: http://www.opendnssec.org/files/source/% {name}-% {version}.tar.gz
-Source: http://www.opendnssec.org/files/source/testing/%{name}-%{version}b1.tar.gz
+Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
Source1: ods-enforcerd.init
Source2: ods-signerd.init
Source3: ods.sysconfig
@@ -19,6 +18,10 @@ Requires: opencryptoki, softhsm
BuildRequires: ldns-devel >= 1.6.13, sqlite-devel , openssl-devel
BuildRequires: libxml2-devel CUnit-devel, doxygen
Requires(pre): shadow-utils
+%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.
@@ -26,9 +29,9 @@ 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}b1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-%{version}%{?prever}
+%patch1 -p1 -b .aggressive-retry
+%patch2 -p1 -b .nsec3param
%build
%configure --with-ldns=%{_libdir}
@@ -67,13 +70,12 @@ mkdir -p %{buildroot}%{_localstatedir}/run/opendnssec
%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
@@ -107,7 +109,12 @@ if [ "$1" -ge "1" ]; then
fi
%changelog
-* Fri Sep 21 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.b1.1
+* Wed Sep 26 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.2.b1
+- Just an EVR fix to the proper standard
+- Remove accidentally added (but not released) Epoch:
+- Minor spec file cleanup
+
+* Wed Sep 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.b1.1
- Updated to 1.4.0b1
- Patch to more aggressively try to take lock for resigning
- Patch to give NSEC3PARAM record a TTL=0
More information about the scm-commits
mailing list