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

Make primary python3 version, but install it last

Browse Source
This commit is contained in:
Petr Menšík 2018-04-09 11:26:06 +02:00
parent 1b283a2c9d
commit 749ab1486e
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
unbound.spec
View File

@ -15,10 +15,10 @@
%endif # with_python3 %endif # with_python3
%if 0%{with_python2} && 0%{with_python3} %if 0%{with_python2} && 0%{with_python3}
%global dir_primary %{pkgname}_python2 %global dir_primary %{pkgname}_python3
%global python_primary %{__python2} %global python_primary %{__python3}
%global dir_secondary %{pkgname}_python3 %global dir_secondary %{pkgname}_python2
%global python_secondary %{__python3} %global python_secondary %{__python2}
%else %else
%global dir_primary %{pkgname} %global dir_primary %{pkgname}
%endif # with_python2 && with_python3 %endif # with_python2 && with_python3
@ -217,18 +217,19 @@ popd
%install %install
install -p -m 0644 %{SOURCE16} . install -p -m 0644 %{SOURCE16} .
%if 0%{?python_secondary:1}
# install first secondary build. It will be overwritten by primary
pushd %{dir_secondary}
%{__make} DESTDIR=%{buildroot} unbound-event-install install
popd
%endif # python_secondary
pushd %{dir_primary} pushd %{dir_primary}
%{__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
%if 0%{?python_secondary:1}
pushd %{dir_secondary}
%{__make} DESTDIR=%{buildroot} unbound-event-install install
install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp
popd
%endif # with_python3
install -d -m 0755 %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig install -d -m 0755 %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unbound.service install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unbound.service
install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/unbound-keygen.service install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/unbound-keygen.service
@ -248,20 +249,11 @@ for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unboun
done done
%endif %endif
%if 0%{?python_primary:1}
pushd %{dir_primary} pushd %{dir_primary}
%endif # python_primary
%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
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%{?python_primary:1}
popd popd
%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
@ -442,7 +434,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 - Simplify building with single python version, make python3 primary
* 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