Accepting request 547893 from server:dns
OBS-URL: https://build.opensuse.org/request/show/547893 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unbound?expand=0&rev=21
This commit is contained in:
commit
bb65618e81
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 1 09:31:03 UTC 2017 - cbosdonnat@suse.com
|
||||||
|
|
||||||
|
- Use python3 instead of python2 (fate#323526)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 23 13:49:02 UTC 2017 - rbrown@suse.com
|
Thu Nov 23 13:49:02 UTC 2017 - rbrown@suse.com
|
||||||
|
|
||||||
|
21
unbound.spec
21
unbound.spec
@ -52,7 +52,7 @@
|
|||||||
%define piddir %{_localstatedir}/run
|
%define piddir %{_localstatedir}/run
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with python}
|
%if 0%{?suse_version} < 1330 && %{with python}
|
||||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
%{!?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)")}
|
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||||
%endif
|
%endif
|
||||||
@ -69,7 +69,12 @@ BuildRequires: libevent-devel
|
|||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
BuildRequires: libsodium-devel
|
BuildRequires: libsodium-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
%if 0%{?suse_version} < 1330
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: python-rpm-macros
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
%endif
|
||||||
%if %{with dnstap}
|
%if %{with dnstap}
|
||||||
BuildRequires: libfstrm-devel
|
BuildRequires: libfstrm-devel
|
||||||
BuildRequires: libprotobuf-c-devel >= 1.0.0
|
BuildRequires: libprotobuf-c-devel >= 1.0.0
|
||||||
@ -212,7 +217,11 @@ export CXXFLAGS="%{optflags}"
|
|||||||
--with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
|
--with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
|
||||||
--with-pidfile=%{piddir}%{name}/%{name}.pid \
|
--with-pidfile=%{piddir}%{name}/%{name}.pid \
|
||||||
%if %{with python}
|
%if %{with python}
|
||||||
--with-pythonmodule --with-pyunbound \
|
%if 0%{?suse_version} < 1330
|
||||||
|
--with-pythonmodule --with-pyunbound\
|
||||||
|
%else
|
||||||
|
--with-pythonmodule --with-pyunbound PYTHON=%{__python3}\
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key
|
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key
|
||||||
|
|
||||||
@ -267,7 +276,11 @@ install -m 0644 %{SOURCE13} %{buildroot}%{_sharedstatedir}/unbound/roo
|
|||||||
# remove static library from install (fedora packaging guidelines)
|
# remove static library from install (fedora packaging guidelines)
|
||||||
rm %{buildroot}%{_libdir}/*.la
|
rm %{buildroot}%{_libdir}/*.la
|
||||||
%if %{with python}
|
%if %{with python}
|
||||||
|
%if 0%{?suse_version} < 1330
|
||||||
rm %{buildroot}%{python_sitearch}/*.la
|
rm %{buildroot}%{python_sitearch}/*.la
|
||||||
|
%else
|
||||||
|
rm %{buildroot}%{python3_sitearch}/*.la
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# create softlink for all functions of libunbound man pages
|
# create softlink for all functions of libunbound man pages
|
||||||
@ -370,7 +383,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/unbound.conf || :
|
|||||||
%if %{with python}
|
%if %{with python}
|
||||||
%files python
|
%files python
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
%if 0%{?suse_version} < 1330
|
||||||
%{python_sitearch}/*
|
%{python_sitearch}/*
|
||||||
|
%else
|
||||||
|
%{python3_sitearch}/*
|
||||||
|
%endif
|
||||||
%doc libunbound/python/examples/*
|
%doc libunbound/python/examples/*
|
||||||
%doc pythonmod/examples/*
|
%doc pythonmod/examples/*
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user