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

Update python3 sed hack to avoid '/usr/bin/python32' dep

Browse Source 
In F28 and earlier /usr/bin/python exists during the build, and
the build process decides PYTHON is /usr/bin/python, so this
sed command works. In F29+ /usr/bin/python does not exist during
the build, so the build process decides /usr/bin/python2 is
PYTHON, and when we do 's!/usr/bin/python!/usr/bin/python3!', we
wind up with /usr/bin/python32...which is not what we wanted.
So, let's fix that.
This commit is contained in:
Adam Williamson 2018-07-30 15:39:38 -07:00
parent fed0baaeba
commit 63dfef7216
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
avahi.spec
View File

@ -26,7 +26,7 @@
Name: avahi
Version: 0.7
Release: 15%{?dist}
Release: 16%{?dist}
Summary: Local network service discovery
License: LGPLv2+
URL: http://avahi.org
@ -439,7 +439,7 @@ ln -s avahi-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/
mkdir -p %{buildroot}%{python3_sitelib}/avahi/
cp -r %{buildroot}%{python2_sitelib}/avahi/* %{buildroot}%{python3_sitelib}/avahi/
rm -fv %{buildroot}%{buildroot}%{python3_sitelib}/avahi/*.py{c,o}
sed -i 's!/usr/bin/python!/usr/bin/python3!' %{buildroot}%{python3_sitelib}/avahi/ServiceTypeDatabase.py
sed -i 's!/usr/bin/python2!/usr/bin/python3!' %{buildroot}%{python3_sitelib}/avahi/ServiceTypeDatabase.py
rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-daemon
rm -fv %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd
@ -698,6 +698,9 @@ exit 0
%changelog
* Mon Jul 30 2018 Adam Williamson <awilliam@redhat.com> - 0.7-16
- Update python3 sed hack to avoid '/usr/bin/python32' dep
* Tue Jul 24 2018 Jan Grulich <jgrulich@redhat.com> - 0.7-15
- Requires: tigervnc
Tigervnc removed old obsoleted provides