rpms/unbound
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Simplify building with single python version

Browse Source
This commit is contained in:
Petr Menšík 2018-04-09 09:58:43 +02:00
parent 20982803c9
commit 1b283a2c9d
1 changed files with 67 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
unbound.spec
View File

@ -1,23 +1,45 @@
%{?!with_python: %global with_python 1} %{?!with_python2: %global with_python2 1}
%{?!with_python3: %global with_python3 1} %{?!with_python3: %global with_python3 1}
%{?!with_munin: %global with_munin 1} %{?!with_munin: %global with_munin 1}
%if 0%{with_python} == 0
# if not building Python, don't build Python3
%global with_python3 0
%else # with_python
# needed just for EPEL
%if 0%{?rhel} <= 6
%{!?__python2: %global __python2 /usr/bin/python2}
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif # rhel <= 6
%endif # with_python
%global _hardened_build 1 %global _hardened_build 1
#global extra_version rc1 #global extra_version rc1
%if 0%{with_python2}
%global python_primary %{__python2}
%endif # with_python2
%if 0%{with_python3}
%global python_primary %{__python3}
%endif # with_python3
%if 0%{with_python2} && 0%{with_python3}
%global dir_primary %{pkgname}_python2
%global python_primary %{__python2}
%global dir_secondary %{pkgname}_python3
%global python_secondary %{__python3}
%else
%global dir_primary %{pkgname}
%endif # with_python2 && with_python3
%if 0%{?rhel}
%global with_munin 0
%if 0%{?with_python2} && 0%{?rhel} <= 6
# needed just for EPEL
%{!?__python2: %global __python2 /usr/bin/python2}
%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif # with_python2 && rhel <= 6
%if 0%{?rhel} <= 7
%global with_python3 0
%else
%global with_python2 0
%endif # rhel <= 7
%endif # rhel
Summary: Validating, recursive, and caching DNS(SEC) resolver Summary: Validating, recursive, and caching DNS(SEC) resolver
Name: unbound Name: unbound
Version: 1.7.0 Version: 1.7.0
@ -50,11 +72,11 @@ BuildRequires: gcc, make
BuildRequires: flex, openssl-devel BuildRequires: flex, openssl-devel
BuildRequires: libevent-devel expat-devel BuildRequires: libevent-devel expat-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if 0%{with_python} %if 0%{with_python2}
BuildRequires: python2-devel swig BuildRequires: python2-devel swig
%endif # with_python %endif # with_python
%if 0%{with_python3} %if 0%{with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel swig
%endif # with_python3 %endif # with_python3
BuildRequires: systemd BuildRequires: systemd
# Required for SVN versions # Required for SVN versions
@ -110,7 +132,7 @@ Requires(pre): shadow-utils
%description libs %description libs
Contains libraries used by the unbound server and client applications Contains libraries used by the unbound server and client applications
%if 0%{with_python} %if 0%{with_python2}
%package -n python2-unbound %package -n python2-unbound
%{?python_provide:%python_provide python2-unbound} %{?python_provide:%python_provide python2-unbound}
Summary: Python 2 modules and extensions for unbound Summary: Python 2 modules and extensions for unbound
@ -138,18 +160,10 @@ Python 3 modules and extensions for unbound
%{?extra_version:%global pkgname %{name}-%{version}%{extra_version}}%{!?extra_version:%global pkgname %{name}-%{version}} %{?extra_version:%global pkgname %{name}-%{version}%{extra_version}}%{!?extra_version:%global pkgname %{name}-%{version}}
%setup -qcn %{pkgname} %setup -qcn %{pkgname}
%if 0%{with_python}
mv %{pkgname} %{pkgname}_python2
pushd %{pkgname}_python2
%patch1 -p1
%patch2 -p1
%patch3 -p1
%else
pushd %{pkgname} pushd %{pkgname}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p0 %patch3 -p1
%endif # with_python
# only for snapshots # only for snapshots
# autoreconf -iv # autoreconf -iv
@ -158,10 +172,10 @@ pushd %{pkgname}
cp -pr doc pythonmod libunbound ../ cp -pr doc pythonmod libunbound ../
popd popd
%if 0%{?with_python3} %if 0%{with_python2} && 0%{with_python3}
cp -a %{pkgname}_python2 %{pkgname}_python3 mv %{pkgname} %{dir_primary}
%endif # with_python3 cp -a %{dir_primary} %{dir_secondary}
%endif
%build %build
# This is needed to rebuild the configure script to support Python 3.x # This is needed to rebuild the configure script to support Python 3.x
@ -177,52 +191,39 @@ cp -a %{pkgname}_python2 %{pkgname}_python3
--enable-sha2 --disable-gost --enable-ecdsa \\\ --enable-sha2 --disable-gost --enable-ecdsa \\\
--with-rootkey-file=%{_sharedstatedir}/unbound/root.key --with-rootkey-file=%{_sharedstatedir}/unbound/root.key
%if 0%{with_python} pushd %{dir_primary}
pushd %{pkgname}_python2
%else
pushd %{pkgname}
%endif # with_python
%configure \ %configure \
%if %{with_python} %if 0%{?python_primary:1}
--with-pythonmodule --with-pyunbound PYTHON=%{__python2} \ --with-pythonmodule --with-pyunbound PYTHON=%{python_primary} \
%endif # with_python %endif # python_primary
%{configure_args} %{configure_args}
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} streamtcp %{__make} %{?_smp_mflags} streamtcp
%if 0%{with_python}
popd popd
%endif # with_python
%if 0%{with_python3} %if 0%{?python_secondary:1}
pushd %{pkgname}_python3 pushd %{dir_secondary}
%configure \ %configure \
--with-pythonmodule --with-pyunbound PYTHON=%{__python3} \ --with-pythonmodule --with-pyunbound PYTHON=%{python_secondary} \
%{configure_args} %{configure_args}
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags} streamtcp
popd popd
%endif # with_python3 %endif # python_secondary
%install %install
install -p -m 0644 %{SOURCE16} . install -p -m 0644 %{SOURCE16} .
%if 0%{with_python} pushd %{dir_primary}
pushd %{pkgname}_python2
%else
pushd %{pkgname}
%endif # with_python
%{__make} DESTDIR=%{buildroot} unbound-event-install install %{__make} DESTDIR=%{buildroot} unbound-event-install install
install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
%if 0%{with_python}
popd popd
%endif # with_python
%if 0%{with_python3} %if 0%{?python_secondary:1}
pushd %{pkgname}_python3 pushd %{dir_secondary}
%{__make} DESTDIR=%{buildroot} unbound-event-install install %{__make} DESTDIR=%{buildroot} unbound-event-install install
install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
popd popd
@ -247,20 +248,20 @@ for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unboun
done done
%endif %endif
%if 0%{with_python} %if 0%{?python_primary:1}
pushd %{pkgname}_python2 pushd %{dir_primary}
%endif # with_python %endif # python_primary
%if 0%{with_python3} %if 0%{?python_secondary:1}
# install streamtcp man page # install streamtcp man page
install -m 0644 testcode/streamtcp.1 %{buildroot}/%{_mandir}/man1/unbound-streamtcp.1 install -m 0644 testcode/streamtcp.1 %{buildroot}/%{_mandir}/man1/unbound-streamtcp.1
%endif %endif
install -D -m 0644 contrib/libunbound.pc %{buildroot}/%{_libdir}/pkgconfig/libunbound.pc install -D -m 0644 contrib/libunbound.pc %{buildroot}/%{_libdir}/pkgconfig/libunbound.pc
%if 0%{with_python} %if 0%{?python_primary:1}
popd popd
%endif # with_python %endif # python_primary
# Install tmpfiles.d config # Install tmpfiles.d config
install -d -m 0755 %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sharedstatedir}/unbound install -d -m 0755 %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sharedstatedir}/unbound
@ -275,7 +276,7 @@ install -m 0644 %{SOURCE13} %{buildroot}%{_sharedstatedir}/unbound/root.key
rm %{buildroot}%{_libdir}/*.la rm %{buildroot}%{_libdir}/*.la
%if 0%{with_python} %if 0%{with_python2}
rm %{buildroot}%{python2_sitearch}/*.la rm %{buildroot}%{python2_sitearch}/*.la
%endif # with_python %endif # with_python
@ -348,28 +349,23 @@ fi
/bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || : /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
%check %check
%if 0%{with_python} pushd %{dir_primary}
pushd %{pkgname}_python2
#pushd pythonmod #pushd pythonmod
#make test #make test
#popd #popd
%else
pushd %{pkgname}
%endif # with_python
make check make check
popd popd
%if 0%{with_python3} %if 0%{?python_secondary:1}
pushd %{pkgname}_python3 pushd %{dir_secondary}
#pushd pythonmod #pushd pythonmod
#make test #make test
#popd #popd
make check make check
popd popd
%endif # with_python3 %endif # python_secondary
%files %files
@ -397,7 +393,7 @@ popd
%exclude %{_mandir}/man8/unbound-anchor* %exclude %{_mandir}/man8/unbound-anchor*
%{_mandir}/man8/* %{_mandir}/man8/*
%if 0%{with_python} %if 0%{with_python2}
%files -n python2-unbound %files -n python2-unbound
%license pythonmod/LICENSE %license pythonmod/LICENSE
%{python2_sitearch}/* %{python2_sitearch}/*
@ -446,6 +442,7 @@ popd
* Mon Apr 09 2018 Petr Menšík <pemensik@redhat.com> - 1.7.0-5 * Mon Apr 09 2018 Petr Menšík <pemensik@redhat.com> - 1.7.0-5
- Require gcc and make on build - Require gcc and make on build
- Remove group, simplify systemd requires - Remove group, simplify systemd requires
- Simplify building with single python version
* Mon Apr 09 2018 Paul Wouters <pwouters@redhat.com> - 1.7.0-4 * Mon Apr 09 2018 Paul Wouters <pwouters@redhat.com> - 1.7.0-4
- Patch for prefetching after flushing cache - Patch for prefetching after flushing cache