From 91af75721ec50ec21691f50c1c1a9a1c053848dc Mon Sep 17 00:00:00 2001 From: lei_ju <983277505@qq.com> Date: Fri, 30 Oct 2020 09:31:43 +0800 Subject: [PATCH] Modify BuildRequires from python2-devel to python3-devel --- 0002-Explicitly-use-python3.patch | 36 +++++++++++++++++++++++++++++++ b43-tools.spec | 17 +++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 0002-Explicitly-use-python3.patch diff --git a/0002-Explicitly-use-python3.patch b/0002-Explicitly-use-python3.patch new file mode 100644 index 0000000..dd3d0ff --- /dev/null +++ b/0002-Explicitly-use-python3.patch @@ -0,0 +1,36 @@ +From: Peter Lemenkov +Date: Wed, 27 Mar 2019 14:53:02 +0300 +Subject: [PATCH] Explicitly use python3 + +Signed-off-by: Peter Lemenkov + +diff --git a/disassembler/b43-ivaldump b/disassembler/b43-ivaldump +index ce06cbb..1de4b42 100755 +--- a/disassembler/b43-ivaldump ++++ b/disassembler/b43-ivaldump +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + # A small script to dump the contents of a b43 initvals file + # +diff --git a/disassembler/brcm80211-fwconv b/disassembler/brcm80211-fwconv +index 5c32f28..28884dd 100755 +--- a/disassembler/brcm80211-fwconv ++++ b/disassembler/brcm80211-fwconv +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + # Copyright (C) 2010 Michael Buesch + # +diff --git a/disassembler/brcm80211-ivaldump b/disassembler/brcm80211-ivaldump +index 4225da6..4d2346b 100755 +--- a/disassembler/brcm80211-ivaldump ++++ b/disassembler/brcm80211-ivaldump +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + # A small script to dump the contents of a brcm80211 initvals section + # diff --git a/b43-tools.spec b/b43-tools.spec index 1053dd1..446219b 100644 --- a/b43-tools.spec +++ b/b43-tools.spec @@ -1,13 +1,13 @@ Name: b43-tools Version: 019 -Release: 3 +Release: 4 Summary: Tools for the Broadcom 43xx series WLAN chip License: GPLv2 and GPLv2+ and GPLv3 URL: https://bues.ch/cgit/b43-tools.git Source0: https://bues.ch/cgit/b43-tools.git/snapshot/b43-tools-b43-fwcutter-019.tar.xz -BuildRequires: bison flex flex-static python2-devel +BuildRequires: bison flex flex-static python3-devel Patch0001: 0001-b43-tools-fix-format-security-errors.patch - +Patch0002: 0002-Explicitly-use-python3.patch %description Tools for the Broadcom 43xx series WLAN chip. @@ -23,12 +23,14 @@ install -p -m 0644 ssb_sprom/README README.ssb_sprom install -p -m 0644 ssb_sprom/COPYING COPYING.ssb_sprom install -p -m 0644 debug/install.py debug/setup.py +2to3 -w . + %build CFLAGS="%{optflags}" %make_build -C assembler CFLAGS="%{optflags}" %make_build -C disassembler CFLAGS="%{optflags}" %make_build -C ssb_sprom cd debug -%py2_build +%py3_build %install install -d %{buildroot}%{_bindir} @@ -40,14 +42,17 @@ install -p -m 0755 disassembler/brcm80211-fwconv %{buildroot}%{_bindir} install -p -m 0755 disassembler/brcm80211-ivaldump %{buildroot}%{_bindir} install -p -m 0755 ssb_sprom/ssb-sprom %{buildroot}%{_bindir} cd debug -%py2_install +%py3_install %files %doc README.* COPYING.* %{_bindir}/* -%{python2_sitelib}/* +%{python3_sitelib}/* %changelog +* Tue Oct 27 2020 leiju - 019-4 +- Modify BuildRequires from python2-devel to python3-devel + * Thu Jan 16 2020 sunguoshuai - 019-3 - Change tar packages.