diff --git a/distutils.cfg b/distutils.cfg deleted file mode 100644 index 14839d4..0000000 --- a/distutils.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[build_py] -optimize=0 - -[install] -prefix=/usr/local -optimize=0 diff --git a/python-base.changes b/python-base.changes index bd9fb1b..e809b07 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Oct 15 10:39:15 UTC 2012 - coolo@suse.com + +- buildrequire explicitly netcfg for the test suite + +------------------------------------------------------------------- +Mon Oct 8 14:33:08 UTC 2012 - jmatejek@suse.com + +- remove distutils.cfg (bnc#658604) + * this changes default prefix for distutils to /usr + * see ML for details: +http://lists.opensuse.org/opensuse-packaging/2012-09/msg00254.html + ------------------------------------------------------------------- Fri Aug 3 18:43:32 UTC 2012 - dimstar@opensuse.org diff --git a/python-base.spec b/python-base.spec index d2c5bc1..b707221 100644 --- a/python-base.spec +++ b/python-base.spec @@ -30,7 +30,6 @@ Source0: %{tarname}.tar.bz2 Source1: macros.python Source2: baselibs.conf Source3: README.SUSE -Source4: distutils.cfg Source5: _local.pth # COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch @@ -59,6 +58,8 @@ BuildRequires: automake BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: zlib-devel +# for the test suite +BuildRequires: netcfg # explicitly, see bnc#697251: Requires: libpython2_7-1_0 = %{version} Provides: %{name} = %{python_version} @@ -203,9 +204,6 @@ find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 g # install it ######################################## %make_install OPT="%{optflags} -fPIC" -# install site-specific tweaks -#ln -s python%{python_version} %{buildroot}%{_bindir}/python2 -install -m 644 %{SOURCE4} %{buildroot}%{_libdir}/python%{python_version}/distutils install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages install -d -m 755 %{buildroot}%{_sysconfdir}/rpm install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm