Attachment 384503 Details for Bug 555628 – patch for building for python3 only

[patch] patch for building for python3 only

py3.patch (text/plain), 2.79 KB, created by Thomas Spura on 2010-01-15 02:07:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Spura

Created: 2010-01-15 02:07:18 UTC

Size: 2.79 KB

patch

obsolete

>? .b43-tools.spec.swp
>? b43-tools-0-0.4.git20090125.fc12.src.rpm
>? b43-tools-0-0.5.git20090125.fc12.src.rpm
>? py3.patch
>? x86_64
>Index: b43-tools.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/b43-tools/devel/b43-tools.spec,v
>retrieving revision 1.2
>diff -u -r1.2 b43-tools.spec
>--- b43-tools.spec	24 Jul 2009 17:45:45 -0000	1.2
>+++ b43-tools.spec	15 Jan 2010 02:01:19 -0000
>@@ -1,12 +1,16 @@
>-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
>+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
> 
> %define git_commit 8dc01d7b658dc04c5c500640854c6dba547a3118
> %define git_commit_date 20090125
> 
>+%if 0%{?fedora} >= 12
>+%global python3_only 1
>+%endif
>+
> 
> Name:		b43-tools
> Version:	0
>-Release:	0.4.git%{git_commit_date}%{?dist}
>+Release:	0.5.git%{git_commit_date}%{?dist}
> Summary:	Tools for the Broadcom 43xx series WLAN chip
> Group:		System Environment/Base
> # assembler â GPLv2
>@@ -23,8 +27,13 @@
> BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> BuildRequires:	bison
> BuildRequires:	flex
>+%if 0%{?python3_only}
>+BuildRequires:  python3-devel
>+# required for lib2to3
>+BuildRequires:  python3-tools
>+%else
> BuildRequires:	python-devel
>-
>+%endif
> 
> %description
> Tools for the Broadcom 43xx series WLAN chip.
>@@ -41,11 +50,19 @@
> install -p -m 0644 ssb_sprom/COPYING COPYING.ssb_sprom
> %patch0 -p0 -b .optflags
> 
>+%if 0%{?python3_only}
>+2to3-3 -w .
>+%endif
>+
> %build
> CFLAGS="%{optflags}" make %{?_smp_mflags} -C assembler
> CFLAGS="%{optflags}" make %{?_smp_mflags} -C disassembler
> CFLAGS="%{optflags}" make %{?_smp_mflags} -C ssb_sprom
>+%if 0%{?python3_only}
>+cd debug && python3 install.py build
>+%else
> cd debug && python install.py build
>+%endif
> 
> 
> %install
>@@ -56,7 +73,11 @@
> install -p -m 0755 disassembler/b43-dasm $RPM_BUILD_ROOT%{_bindir}
> install -p -m 0755 disassembler/b43-ivaldump $RPM_BUILD_ROOT%{_bindir}
> install -p -m 0755 ssb_sprom/ssb-sprom $RPM_BUILD_ROOT%{_bindir}
>+%if 0%{?python3_only}
>+cd debug && python3 install.py install --skip-build --root $RPM_BUILD_ROOT
>+%else
> cd debug && python install.py install --skip-build --root $RPM_BUILD_ROOT
>+%endif
> 
> 
> %clean
>@@ -73,10 +94,17 @@
> %{_bindir}/b43-fwdump
> %{_bindir}/b43-ivaldump
> %{_bindir}/ssb-sprom
>+%if 0%{?python3_only}
>+%{python3_sitelib}/*
>+%else
> %{python_sitelib}/*
>+%endif
> 
> 
> %changelog
>+* Fri Jan 15 2010 Thomas Spura <tomspur@fedoraproject.org> - 0-0.5.git20090125
>+- on fedora > 12 build *ONLY* for python3 and *NOT* for python2 anymore
>+
> * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.4.git20090125
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 555628: 384503