[unbound/f14] updated spec for 1.4.12

[Paul Wouters]

commit 5c448ee4755d69768a52e61f702bd5b0927c6c62
Author: Paul Wouters <paul at xelerance.com>
Date:   Mon Aug 8 22:32:50 2011 -0400

    updated spec for 1.4.12
    
    Conflicts:
    
    	unbound.spec

 .gitignore   |    1 +
 sources      |    1 +
 unbound.spec |   26 +++++++++++++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8754e15..63d5359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ unbound-1.4.3.tar.gz
 unbound-1.4.4.tar.gz
 unbound-1.4.5.tar.gz
 /unbound-1.4.8.tar.gz
+/unbound-1.4.12.tar.gz
diff --git a/sources b/sources
index 5fa3fe0..132364e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 526898f2375b6ca507bee917ff9c21e0  unbound-1.4.8.tar.gz
+673a224c76345003fd168448ca12fbb2  unbound-1.4.12.tar.gz
diff --git a/unbound.spec b/unbound.spec
index f3aa6b7..a210e64 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -8,8 +8,8 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.4.8
-Release: 2%{?dist}
+Version: 1.4.12
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -20,7 +20,7 @@ Source4: unbound_munin_
 Source5: root.key
 Source6: dlv.isc.org.key
 Patch1: unbound-1.2-glob.patch
-Patch2: unbound-CVE-2011-1922.patch
+Patch2: unbound-1.4.12-pythonmod.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,8 +30,7 @@ BuildRequires: libevent-devel expat-devel
 BuildRequires:  python-devel swig
 %endif
 # Required for SVN versions
-#BuildRequires: bison
-
+# BuildRequires: bison
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -94,11 +93,11 @@ Python modules and extensions for unbound
 %prep
 %setup -q 
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
-            --disable-rpath --enable-debug --disable-static \
+            --disable-rpath --disable-static \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid \
 %if %{with_python}
@@ -151,6 +150,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %if %{with_python}
 %files python
 %attr(0644,root,root) %{python_sitelib}/*
+%{python_sitelib}/*
+%doc libunbound/python/examples/*
+%doc pythonmod/examples/*
 %endif
 
 %files munin
@@ -200,6 +202,16 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 08 2011 Paul Wouters <paul at xelerance.com> - 1.4.12-1
+- Updated to 1.4.12
+- Updated stock unbound.conf for new options introduced
+- Added pythonmod docs and examples
+- Added ghost for /var/run/unbound (bz#656710)
+- Fix for python module load in the server (Tom Hendrikx)
+- No longer enable --enable-debug as it causes degraded  performance
+  under load.
+- Removed merged in CVE-2011-1922 patch
+
 * Wed May 25 2011 Paul Wouters <paul at xelerance.com> - 1.4.8-2
 - Applied patch for CVE-2011-1922 DoS vulnerability