Attachment 695978 Details for Bug 909831 – suggested patch

[patch] suggested patch

0001-Build-also-python3-version.patch (text/plain), 3.90 KB, created by Matěj Cepl on 2013-02-11 09:23:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2013-02-11 09:23:37 UTC

Size: 3.90 KB

patch

obsolete

>From 6e6dbbdfb4fabcce1aa40e99338a898764b6eae5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Mon, 11 Feb 2013 10:15:18 +0100
>Subject: [PATCH] Build also python3 version.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> python-pyasn1.spec | 71 +++++++++++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 60 insertions(+), 11 deletions(-)
>
>diff --git a/python-pyasn1.spec b/python-pyasn1.spec
>index 766a8b4..a37f284 100644
>--- a/python-pyasn1.spec
>+++ b/python-pyasn1.spec
>@@ -2,10 +2,11 @@
> 
> %global module pyasn1
> %global modules_version 0.0.2
>+%bcond_without python3
> 
> Name:           python-pyasn1
> Version:        0.1.2
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        ASN.1 tools for Python
> License:        BSD
> Group:          System Environment/Libraries
>@@ -14,7 +15,11 @@ Source1:        http://downloads.sourceforge.net/pyasn1/pyasn1-modules-%{modules
> URL:            http://pyasn1.sourceforge.net/
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch:      noarch
>-BuildRequires:  python-devel python-setuptools
>+%if %{with python3}
>+BuildRequires:  python3-devel
>+%endif
>+BuildRequires:  python2-devel
>+
> 
> %description
> This project is dedicated to implementation of ASN.1 types (concrete syntax)
>@@ -28,24 +33,53 @@ Summary:    Modules for pyasn1
> %description modules
> ASN.1 types modules.
> 
>+%if %{with python3}
>+%package -n python3-pyasn1
>+Summary: Python3 version of %{name}
>+Group: Development/Libraries
>+
>+%description -n python3-pyasn1
>+python3 version of the %{name}.
>+
>+%package -n python3-pyasn1-modules
>+Summary: Python3 version of %{name}-modules
>+Group: Development/Libraries
>+
>+%description -n python3-pyasn1-modules
>+python3 version of the %{name}-modules.
>+
>+%endif
>+
> %prep
> %setup -n %{module}-%{version} -q -b1
> 
> 
> %build
>-%{__python} setup.py build
>+%{__python2} setup.py build
> pushd ../pyasn1-modules-%{modules_version}
>-%{__python} setup.py build
>+%{__python2} setup.py build
> popd
> 
>-
> %install
> rm -rf $RPM_BUILD_ROOT
>-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+
>+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
> pushd ../pyasn1-modules-%{modules_version}
>-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
> popd
> 
>+%if %{with python3}
>+%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+pushd ../pyasn1-modules-%{modules_version}
>+%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
>+popd
>+%endif
>+
>+%check
>+%{__python2} test/suite.py
>+%if %{with python3}
>+%{__python3} test/suite.py
>+%endif
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -54,16 +88,31 @@ rm -rf $RPM_BUILD_ROOT
> %files
> %defattr(-,root,root,-)
> %doc README LICENSE doc/*.html
>-%{python_sitelib}/%{module}
>-%{python_sitelib}/%{module}-%{version}-*.egg-info/
>+%{python2_sitelib}/%{module}
>+%{python2_sitelib}/%{module}-%{version}-*.egg-info/
> 
> %files modules
> %defattr(-,root,root,-)
>-%{python_sitelib}/%{module}_modules/
>-%{python_sitelib}/%{module}_modules-%{modules_version}-*.egg-info/
>+%{python2_sitelib}/%{module}_modules/
>+%{python2_sitelib}/%{module}_modules-%{modules_version}-*.egg-info/
> 
>+%if %{with python3}
>+%files -n python3-pyasn1
>+%defattr(-,root,root,-)
>+%{python3_sitelib}/%{module}
>+%{python3_sitelib}/%{module}-%{version}-*.egg-info/
>+
>+%files -n python3-pyasn1-modules
>+%defattr(-,root,root,-)
>+%{python3_sitelib}/%{module}_modules/
>+%{python3_sitelib}/%{module}_modules-%{modules_version}-*.egg-info/
>+%endif
> 
> %changelog
>+* Mon Feb 11 2013 MatÄj Cepl <mcepl@redhat.com> - 0.1.2-3
>+- Build also python3 version.
>+- Run the test suite. 
>+
> * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.8.1
>

Flags:

rcritten: review-

Actions: View | Diff

Attachments on bug 909831: 695978 | 698330 | 698341