X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=unbound.spec;h=b6b21ce29b2004bce25a55fb56b5838e4de823d4;hb=ccc6f255c59e4079e19552494a0ddb80fb8e6c4c;hp=f0d62f040c751d8c08553e7317ead6d24bc3421f;hpb=42c1368bb20402dcca05232e727fbb23ef901c34;p=packages%2Funbound.git

diff --git a/unbound.spec b/unbound.spec
index f0d62f0..b6b21ce 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -1,42 +1,50 @@
+# FIXME:
+# - stop using nobody group
 #
 # Conditional build:
 %bcond_without	python	# Python binding
 %bcond_with	dnstap	# dnstap replication support
+%bcond_with	systemd	# systemd support
+%bcond_without	tests
 #
 Summary:	Recursive, validating DNS resolver
 Summary(pl.UTF-8):	Rekurencyjny, weryfikujący resolver DNS
 Name:		unbound
-Version:	1.5.6
-Release:	2
+Version:	1.8.2
+Release:	1
 License:	BSD
 Group:		Applications/Network
 Source0:	http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	691a34abd8e9257dd65b70f28326c1f0
+# Source0-md5:	3b2f1024df47ccc59a8100c3b40c6dc1
 Source1:	%{name}.init
 Source2:	%{name}.service
 Source3:	https://data.iana.org/root-anchors/icannbundle.pem
-# Source3-md5:	1ad315c80d044eca2da29785eee6f7c3
+# Source3-md5:	24a426d59b61524623695f1b849f159b
 Source4:	ftp://ftp.internic.net/domain/named.cache
-# Source4-md5:	b2afc34d106e104730b63876c9a07caf
+# Source4-md5:	a2d36ae713cf5e8ea59641b320b6ec5d
 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
+BuildRequires:	bison
 BuildRequires:	expat-devel
+BuildRequires:	flex
 %{?with_dnstap:BuildRequires:	fstrm-devel}
 BuildRequires:	libevent-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 1.0
 %{?with_dnstap:BuildRequires:	protobuf-c-devel}
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpmbuild(macros) >= 1.671
+%{?with_systemd:BuildRequires:	systemd-devel}
 %if %{with python}
 BuildRequires:	python-devel >= 1:2.4.0
 BuildRequires:	swig-python
 %endif
-Requires(post,preun):	/sbin/chkconfig
-BuildRequires:	rpmbuild(macros) >= 1.671
 Provides:	user(unbound)
+Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
@@ -109,7 +117,7 @@ Statyczna biblioteka unbound.
 %package -n python-unbound
 Summary:	Python interface to unbound library
 Summary(pl.UTF-8):	Pythonowy interfejs do biblioteki unbound
-Group:		Python/Libraries
+Group:		Libraries/Python
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n python-unbound
@@ -122,6 +130,8 @@ Pythonowy interfejs do biblioteki unbound.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -130,8 +140,10 @@ Pythonowy interfejs do biblioteki unbound.
 %{__autoheader}
 %configure \
 	%{?with_dnstap:--enable-dnstap} \
+	%{?with_systemd:--enable-systemd} \
 	%{__with_without python pyunbound} \
 	%{__with_without python pythonmodule} \
+	--with-libevent \
 	--with-pidfile=/run/%{name}.pid \
 	--with-chroot-dir="" \
 	--with-conf-file=%{_sysconfdir}/%{name}/%{name}.conf \
@@ -140,6 +152,10 @@ Pythonowy interfejs do biblioteki unbound.
 
 %{__make}
 
+%if %{with tests}
+%{__make} check
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir},/var/lib/%{name}}
@@ -147,10 +163,10 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir},/var/lib/%{name}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/icannbundle.pem
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/named.cache
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/icannbundle.pem
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/named.cache
 
 touch $RPM_BUILD_ROOT/var/lib/%{name}/root.key
 
@@ -217,12 +233,13 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libunbound.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libunbound.so.2
+%attr(755,root,root) %ghost %{_libdir}/libunbound.so.8
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libunbound.so
 %{_libdir}/libunbound.la
+%{_pkgconfigdir}/libunbound.pc
 %{_includedir}/unbound.h
 %{_mandir}/man3/libunbound.3*
 %{_mandir}/man3/ub_*.3*