up to 1.16.0

- dropped pythondir and flex patches -- builds fine without them, no
  -Lpythondir in pkgconfig

diff --git a/unbound-flex.patch b/unbound-flex.patch
deleted file mode 100644 (file)
index a922bf8..0000000
--- a/unbound-flex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unbound-1.6.1/Makefile.in.orig     2016-12-06 16:29:35.000000000 +0100
-+++ unbound-1.6.1/Makefile.in  2017-03-09 18:32:30.802012387 +0100
-@@ -412,7 +412,7 @@
-       if test "$(LEX)" != ":"; then \
-               echo "#include \"config.h\"" > $@ ;\
-               echo "#include \"util/configyyrename.h\"" >> $@ ;\
--              $(LEX) -t $(srcdir)/util/configlexer.lex >> $@ ;\
-+              $(LEX) -t --prefix=ub_c_ $(srcdir)/util/configlexer.lex >> $@ ;\
-       fi
- 
- util/configparser.c util/configparser.h:  $(srcdir)/util/configparser.y

diff --git a/unbound-pythondir.patch b/unbound-pythondir.patch
deleted file mode 100644 (file)
index 7c5f724..0000000
--- a/unbound-pythondir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- unbound-1.5.7/acx_python.m4.orig   2014-09-19 11:57:20.000000000 +0200
-+++ unbound-1.5.7/acx_python.m4        2016-03-02 07:58:16.255669696 +0100
-@@ -53,7 +53,7 @@
-         AC_MSG_CHECKING([for Python library path])
-         if test -z "$PYTHON_LDFLAGS"; then
-                 PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
--                        print('-L'+get_config_var('LIBDIR')+' -L'+get_config_var('LIBDEST')+' '+get_config_var('BLDLIBRARY'));"`
-+                        print('-L'+get_config_var('LIBDIR')+' '+get_config_var('BLDLIBRARY'));"`
-         fi
-         AC_MSG_RESULT([$PYTHON_LDFLAGS])
-         AC_SUBST([PYTHON_LDFLAGS])
-@@ -65,7 +65,7 @@
-         AC_MSG_CHECKING([for Python site-packages path])
-         if test -z "$PYTHON_SITE_PKG"; then
-                 PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
--                        print(distutils.sysconfig.get_python_lib(1,0));"`
-+                        print(distutils.sysconfig.get_python_lib(1,0, prefix='${prefix}'));"`
-         fi
-         AC_MSG_RESULT([$PYTHON_SITE_PKG])
-         AC_SUBST([PYTHON_SITE_PKG])

diff --git a/unbound.spec b/unbound.spec
index d4fd48b4f71d2556b57a66ac0e060a854c986021..cc945f74037cb19475b4a3331c93643fc7d37885 100644 (file)
--- a/unbound.spec
+++ b/unbound.spec
@@ -12,12 +12,12 @@
 Summary:       Recursive, validating DNS resolver
 Summary(pl.UTF-8):     Rekurencyjny, weryfikujący resolver DNS
 Name:          unbound
-Version:       1.15.0
-Release:       2
+Version:       1.16.0
+Release:       1
 License:       BSD
 Group:         Applications/Network
 Source0:       https://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 9a309ea06df20b1f6fc2c10b826082ef
+# Source0-md5: 3668c76b195be17ccd2b78ae501d8b3f
 Source1:       %{name}.init
 Source2:       %{name}.service
 Source3:       https://data.iana.org/root-anchors/icannbundle.pem
@@ -26,8 +26,6 @@ Source4:      ftp://ftp.internic.net/domain/named.cache
 # Source4-md5: 174738e23c506ddb1b5c24178e5fdc13
 Patch0:                %{name}-default_trust_anchor.patch
 Patch1:                %{name}-sh.patch
-Patch2:                %{name}-pythondir.patch
-Patch3:                %{name}-flex.patch
 URL:           http://unbound.net/
 BuildRequires: autoconf >= 2.56
 BuildRequires: automake
@@ -136,8 +134,6 @@ Pythonowy interfejs do biblioteki unbound.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}