rpms/unbound/devel unbound-1.2-glob.patch, NONE, 1.1 unbound.spec, 1.29, 1.30

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16102

Modified Files:
	unbound.spec 
Added Files:
	unbound-1.2-glob.patch 
Log Message:
* Sat Jun 20 2009 Paul Wouters <paul at xelerance.com> - 1.3.0-2
- Added missing glob patch to cvs
- Place python macros within the %with_python check


unbound-1.2-glob.patch:

--- NEW FILE unbound-1.2-glob.patch ---
diff -Naur unbound-1.2.0/validator/val_anchor.c unbound-1.2.0.new/validator/val_anchor.c
--- unbound-1.2.0/validator/val_anchor.c	2009-01-07 07:24:34.000000000 -0500
+++ unbound-1.2.0.new/validator/val_anchor.c	2009-01-20 17:31:43.000000000 -0500
@@ -718,7 +718,8 @@
 			log_err("wildcard trusted-keys-file %s: expansion "
 				"failed (%s)", pat, strerror(errno));
 		}
-		return 0;
+		/* ignore globs that yield no files */
+		return 1;
 	}
 	/* process files found, if any */
 	for(i=0; i<(size_t)g.gl_pathc; i++) {


Index: unbound.spec
===================================================================
RCS file: /cvs/extras/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- unbound.spec	21 Jun 2009 04:14:54 -0000	1.29
+++ unbound.spec	21 Jun 2009 04:23:10 -0000	1.30
@@ -1,12 +1,15 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # not ready yet
 %{?!with_python:      %define with_python      0}
 
+%if %{with_python}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -190,6 +193,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Sat Jun 20 2009 Paul Wouters <paul at xelerance.com> - 1.3.0-2
+- Added missing glob patch to cvs
+- Place python macros within the %%with_python check
+
 * Sat Jun 20 2009 Paul Wouters <paul at xelerance.com> - 1.3.0-1
 - Updated to 1.3.0
 - Added unbound-python sub package. disabled for now