From 5e615b8c281807308306dcf1e9312b6f20f46194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Mon, 14 Mar 2016 17:26:23 +0100 Subject: [PATCH] buildable on rhel, updated from git master --- netresolve.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/netresolve.spec b/netresolve.spec index 0537be7..4fbf863 100644 --- a/netresolve.spec +++ b/netresolve.spec @@ -1,8 +1,8 @@ -%global snapshot_suffix .20160307git +%global snapshot_suffix .20160314git Name: netresolve Version: 0.0.1 -Release: 0.14%{?snapshot_suffix}%{?dist} +Release: 0.15%{?snapshot_suffix}%{?dist} Summary: Generic name resolution library Group: System Environment/Libraries License: BSD @@ -10,13 +10,19 @@ URL: https://sourceware.org/%{name}/ Source0: %{name}-0.0.1.tar.xz BuildRequires: ldns-devel BuildRequires: pkgconfig(libcares) +%if 0%{?fedora} BuildRequires: unbound-devel +%endif BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(libasyncns) # live builds BuildRequires: autoconf automake libtool # tests BuildRequires: valgrind +%if 0%{?rhel} +# https://bugzilla.redhat.com/show_bug.cgi?id=1190724 +BuildRequires: openssl-devel +%endif # subpackages installed by netresolve virtual package Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} @@ -76,6 +82,7 @@ Requires: %{name}-core%{?_isa} = %{version}-%{release} This package provides Multicast DNS capabilities using Avahi daemon and libraries. +%if 0%{?fedora} %package backends-ubdns Summary: DNS backend for netresolve based on libunbound Group: Development/Libraries @@ -83,6 +90,7 @@ Requires: %{name}-core%{?_isa} = %{version}-%{release} %description backends-ubdns This package provides DNS capabilities including DNSSEC validation to netresolve using libunbound. +%endif %package devel Summary: Development files for netresolve @@ -111,9 +119,11 @@ make %{?_smp_mflags} %make_install find %{buildroot} -name '*.la' -delete +%if 0%{?fedora} %check export NETRESOLVE_TEST_COMMAND="libtool execute valgrind --leak-check=full --error-exitcode=1 ./netresolve" make check || { cat ./test-suite.log; false; } +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -130,8 +140,10 @@ make check || { cat ./test-suite.log; false; } %post backends-aresdns -p /sbin/ldconfig %postun backends-aresdns -p /sbin/ldconfig +%if 0%{?fedora} %post backends-ubdns -p /sbin/ldconfig %postun backends-ubdns -p /sbin/ldconfig +%endif %post backends-avahi -p /sbin/ldconfig %postun backends-avahi -p /sbin/ldconfig @@ -191,9 +203,11 @@ make check || { cat ./test-suite.log; false; } %{_libdir}/libnetresolve-backend-avahi.so.0 %{_libdir}/libnetresolve-backend-avahi.so.0.0.0 +%if 0%{?fedora} %files backends-ubdns %{_libdir}/libnetresolve-backend-ubdns.so.0 %{_libdir}/libnetresolve-backend-ubdns.so.0.0.0 +%endif %files devel %{_includedir}/netresolve-epoll.h @@ -228,6 +242,9 @@ make check || { cat ./test-suite.log; false; } %{_libdir}/libnss_netresolve.so %changelog +* Mon Mar 14 2016 Pavel Šimerda - 0.0.1-0.15.20160314git +- buildable on rhel, updated from git master + * Mon Mar 07 2016 Pavel Šimerda - 0.0.1-0.14.20160307git - update from git master