[opendnssec/f17] * Fri Jun 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.1-1 - Updated to 1.4.1. NSEC3 handling an

[Paul Wouters]

commit 0ede964f820fbac42add00ceec8014c9f342458f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Jun 28 16:02:25 2013 -0400

    * Fri Jun 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.1-1
    - Updated to 1.4.1. NSEC3 handling and serial number handling fixes
    - Add BuildRequire for systemd-units

 .gitignore      |    1 +
 opendnssec.spec |   10 +++++++---
 sources         |    7 +------
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1469b59..7a480f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /opendnssec-1.4.0b2.tar.gz
 /opendnssec-1.4.0rc1.tar.gz
 /opendnssec-1.4.0rc2.tar.gz
+/opendnssec-1.4.1.tar.gz
diff --git a/opendnssec.spec b/opendnssec.spec
index a9f6c3d..3981827 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,8 +1,8 @@
-%global prever rc2
+#global prever rc2
 Summary: DNSSEC key and zone management software
 Name: opendnssec
-Version: 1.4.0
-Release: 0.7.%{?prever}%{?dist}
+Version: 1.4.1
+Release: 1%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@ -28,6 +28,7 @@ Requires(postun): systemd-units
 #For building snapshots
 Buildrequires: autoconf, automake, libtool, java
 %endif
+Buildrequires: systemd-units
 
 %description
 OpenDNSSEC was created as an open-source turn-key solution for DNSSEC.
@@ -120,6 +121,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Fri Jun 28 2013 Paul Wouters <pwouters at redhat.com> - 1.4.1-1
+- Updated to 1.4.1. NSEC3 handling and serial number handling fixes
+- Add BuildRequire for systemd-units
 
 %changelog
 * Fri Jan 25 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.4.0-0.7.rc2
diff --git a/sources b/sources
index b253b10..18f0126 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-<<<<<<< HEAD
-c7e00424dbbf87ccf4667f3b397b0aa1  opendnssec-1.4.0a1.tar.gz
-c5951e833a9414e3cbe575e7c66ee3ee  opendnssec-1.4.0b1.tar.gz
-=======
-b9f39643c1f7cee1cd53ff3a5386ea63  opendnssec-1.4.0rc2.tar.gz
->>>>>>> f18
+c38eb91a32b77f9b37e8968ce2440469  opendnssec-1.4.1.tar.gz