[opendnssec/el6] * Mon Jan 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.7.rc2 - Updaed to 1.4.0rc2 - This mer

[Paul Wouters]

commit b8dacaf84d531dfec096d1f61863ec8617c0f78b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jan 28 16:32:12 2013 -0500

    * Mon Jan 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.7.rc2
    - Updaed to 1.4.0rc2
    - This merges in r6952

 .gitignore      |    1 +
 opendnssec.spec |   10 ++++++----
 sources         |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 379f1b1..93c3c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /opendnssec-1.4.0b1.tar.gz
 /opendnssec-1.4.0b2.tar.gz
 /opendnssec-1.4.0rc1.tar.gz
+/opendnssec-1.4.0rc2.tar.gz
diff --git a/opendnssec.spec b/opendnssec.spec
index a937ed8..a87481a 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,8 +1,8 @@
-%global prever rc1
+%global prever rc2
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
-Release: 0.6.%{?prever}%{?dist}
+Release: 0.7.%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@ -12,7 +12,6 @@ Source3: ods.sysconfig
 Source4: conf.xml
 Source5: opendnssec.cron
 Source6: kasp.xml
-Patch:   opendnssec-ksk-premature-retirement.patch
 Group: Applications/System
 Requires: opencryptoki, softhsm
 BuildRequires: ldns-devel >= 1.6.13, sqlite-devel , openssl-devel
@@ -33,7 +32,6 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch
 
 %build
 %configure --with-ldns=%{_libdir}
@@ -112,6 +110,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Jan 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.0-0.7.rc2
+- Updaed to 1.4.0rc2
+- This merges in r6952
+
 * Fri Jan 18 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.4.0-0.6.rc1
 - Updated to 1.4.0rc1
 - Applied opendnssec-ksk-premature-retirement.patch (svn r6952)
diff --git a/sources b/sources
index b2f5549..a502c90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfd92b2830e1723acc90f20e575cf8cb  opendnssec-1.4.0rc1.tar.gz
+b9f39643c1f7cee1cd53ff3a5386ea63  opendnssec-1.4.0rc2.tar.gz