!10 [sync] PR-8: 修复python2和python3的兼容性问题

From: @openeuler-sync-bot 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

0002-Explicitly-use-python3.patch

@@ -0,0 +1,36 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 27 Mar 2019 14:53:02 +0300
+Subject: [PATCH] Explicitly use python3
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+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 <m@bues.ch>
+ #
+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
+ #

b43-tools.spec

@@ -1,13 +1,14 @@
 Name:           b43-tools
 Version:        019
-Release:        3
+Release:        7
 Summary:        Tools for the Broadcom 43xx series WLAN chip
-License:        GPLv2 and GPLv2+ and GPLv3
+License:        GPLv2 and GPLv2+ and GPLv3 and BSD-2-Clause and Public Domain
 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 gcc
 Patch0001:      0001-b43-tools-fix-format-security-errors.patch
-
+Patch0002:      0002-Explicitly-use-python3.patch
+Patch0003:      fix-function-file-to-open.patch
 
 %description
 Tools for the Broadcom 43xx series WLAN chip.
@@ -21,14 +22,23 @@ install -p -m 0644 debug/README README.debug
 install -p -m 0644 disassembler/COPYING COPYING.disassembler
 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
+sed 's/py_modules=/version="%{version}", py_modules=/' debug/install.py > debug/setup.py
+
+2to3 -w .
+
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/brcm80211-fwconv
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/b43-ivaldump
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/brcm80211-ivaldump
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/b43-beautifier
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/b43-fwdump
+2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/patcher-template
 
 %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 +50,26 @@ 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 May 30 2023 wulei <wu_lei@hoperun.com> - 019-7
+- Fix python compatibility
+
+* Mon May 31 2021 baizhonggui <baizhonggui@huawei.com> - 019-6
+- Add gcc in BuildRequires
+
+* Tue Jan 5 2021 Ge Wang<wangge20@huawei.com> - 019-5
+- Modify license information
+
+* Tue Oct 27 2020 leiju<leiju4@huawei.com> - 019-4
+- Modify BuildRequires from python2-devel to python3-devel
+
 * Thu Jan 16 2020 sunguoshuai<sunguoshuai@huawei.com> - 019-3
 - Change tar packages.
 

b43-tools.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://bues.ch/cgit/b43-tools.git
+tag_prefix: "b43-fwcutter-"
+seperator: "."

fix-function-file-to-open.patch

@@ -0,0 +1,24 @@
+diff -Nur a/disassembler/b43-ivaldump b/disassembler/b43-ivaldump
+--- a/disassembler/b43-ivaldump	2023-05-30 16:33:01.128951580 +0800
++++ b/disassembler/b43-ivaldump	2023-05-30 16:33:38.732951580 +0800
+@@ -36,7 +36,7 @@
+ filename = sys.argv[1]
+ 
+ try:
+-	ivals = file(filename).read()
++	ivals = open(filename).read()
+ except IOError, e:
+ 	print "Could not read the initvals file: %s" % e.strerror
+ 	sys.exit(1)
+diff -Nur a/disassembler/brcm80211-ivaldump b/disassembler/brcm80211-ivaldump
+--- a/disassembler/brcm80211-ivaldump	2023-05-30 16:33:01.128951580 +0800
++++ b/disassembler/brcm80211-ivaldump	2023-05-30 16:34:17.524951580 +0800
+@@ -36,7 +36,7 @@
+ filename = sys.argv[1]
+ 
+ try:
+-	ivals = file(filename).read()
++	ivals = open(filename).read()
+ except IOError, e:
+ 	print "Could not read the initvals file: %s" % e.strerror
+ 	sys.exit(1)