From 65a1b0a277f139d8e7fa6ea9a36d6823d0fca958ff7adedd8b77a114b18f2d50 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Wed, 4 Jan 2012 16:23:21 +0000 Subject: [PATCH] Accepting request 96388 from home:TheBlackCat:branches:devel:languages:python:Factory Exclude /usr/bin/2to3 to prevent conflicts with python3-2to3 Without this change, it is impossible to have both python-base and python3-2to3 as buildrequires in the same spec file (OBS will return an error). This makes it impossible to build both python2 and python3 versions of many packages in the same spec file. This should really not be in python-base anyway, since it is used by software that is going to be running on python3, not by software running on python2. This will only fix builds on opensuse-factory, I don't know the best way to fix this for earlier versions of openSUSE. OBS-URL: https://build.opensuse.org/request/show/96388 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=111 --- python-base.changes | 5 +++++ python-base.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-base.changes b/python-base.changes index 3ef8071..9752500 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 12 13:39:57 UTC 2011 - toddrme2178@gmail.com + +- Exclude /usr/bin/2to3 to prevent conflicts with python3-2to3 + ------------------------------------------------------------------- Thu Dec 8 13:31:01 UTC 2011 - jmatejek@suse.com diff --git a/python-base.spec b/python-base.spec index b292f63..51d8510 100644 --- a/python-base.spec +++ b/python-base.spec @@ -362,9 +362,9 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %endif %attr(755, root, root) %{_bindir}/pydoc %attr(755, root, root) %{_bindir}/python -%attr(755, root, root) %{_bindir}/2to3 %attr(755, root, root) %{_bindir}/python%{python_version} %attr(755, root, root) %{_bindir}/smtpd.py %{_bindir}/python2 +%exclude %{_bindir}/2to3 %changelog