diff --git a/crda-python-version.patch b/crda-python-version.patch new file mode 100644 index 0000000..1d504c7 --- /dev/null +++ b/crda-python-version.patch @@ -0,0 +1,9 @@ +diff -up crda-3.18/utils/key2pub.py.python crda-3.18/utils/key2pub.py +--- crda-3.18/utils/key2pub.py.python 2018-07-05 13:19:34.316371262 -0400 ++++ crda-3.18/utils/key2pub.py 2018-07-05 13:20:03.388759105 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + import sys + try: diff --git a/crda.spec b/crda.spec index c27c74f..7e0e4c3 100644 --- a/crda.spec +++ b/crda.spec @@ -33,7 +33,8 @@ Patch1: crda-remove-ldconfig.patch # Apply ldflags to libreg Patch2: crda-ldflags.patch # Specify python version in shebang line for .py files -Patch3: wireless-regdb-python-version.patch +Patch3: crda-python-version.patch +Patch4: wireless-regdb-python-version.patch %description @@ -61,8 +62,9 @@ Header files to make use of libreg for accessing regulatory info. cd crda-%{crda_version} %patch1 -p1 -b .ldconfig-remove %patch2 -p2 -b .ldflags +%patch3 -p1 -b .python cd ../wireless-regdb-%{regdb_version} -%patch3 -p2 -b .python +%patch4 -p2 -b .python # Preserve original regulatory.db signature for firmware-like load by kernel # This is an intermediate measure. Ultimately the crda package should @@ -149,6 +151,7 @@ install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1 * Thu Jul 05 2018 John W. Linville - 3.18_2018.05.31-2 - Preserve original regulatory.db.p7s for firmware-like loading by kernel - Remove patch to ensure rebuild of regulatory.db after signature regeneration +- Add another python2-related build fix * Tue May 29 2018 John W. Linville - 3.18_2018.05.31-1 - Update wireless-regdb to version 2018.05.31