- build fixed, TODO: files

diff --git a/python3-build.patch b/python3-build.patch
deleted file mode 100644 (file)
index 30a2a93..0000000
--- a/python3-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Python-3.3.0/Objects/obmalloc.c~   2012-09-29 10:00:46.000000000 +0200
-+++ Python-3.3.0/Objects/obmalloc.c    2012-09-29 23:33:43.775178451 +0200
-@@ -1846,7 +1846,9 @@
- 
-             if (p->ref.count == 0) {
-                 /* currently unused */
-+#ifdef Py_DEBUG
-                 assert(pool_is_in_list(p, arenas[i].freepools));
-+#endif
-                 continue;
-             }
-             ++numpools[sz];

diff --git a/python3-lib64.patch b/python3-lib64.patch
index 6f0cc6f0c7d65351da1d8d1e6344761c97e14adb..7dcc180d1a4c70218c4444ce3b5ee30e3e769aea 100644 (file)
--- a/python3-lib64.patch
+++ b/python3-lib64.patch
@@ -290,12 +290,12 @@ diff -Nur Python-3.2.1.orig//setup.py Python-3.2.1/setup.py
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
 -                                                     ['/usr/lib/termcap'],
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
 -                                                     ['/usr/lib/termcap'],

-+                                                     ['/usr/' + libname + '/termcap'],
++                                                     ['/usr/' + sys.lib + '/termcap'],

                                                       'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
 -                                   library_dirs=['/usr/lib/termcap'],
                                                       'termcap'):
                  readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
 -                                   library_dirs=['/usr/lib/termcap'],

-+                                   library_dirs=['/usr/' + libname + '/termcap'],
++                                   library_dirs=['/usr/' + sys.lib + '/termcap'],

                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:

diff --git a/python3.spec b/python3.spec
index cef8db82c35597919f03e10e5669acddfa6ac028..597cf530c6b163d891b664e94cb64ae87e2b14a7 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -17,7 +17,7 @@
 %define                broken_tests test_httpservers test_distutils test_cmd_line test_pydoc test_telnetlib test_zlib test_gdb test_site
 
 %define py_ver         3.3
 %define                broken_tests test_httpservers test_distutils test_cmd_line test_pydoc test_telnetlib test_zlib test_gdb test_site
 
 %define py_ver         3.3

-%define py_abi         %{py_ver}mu
+%define py_abi         %{py_ver}m

 %define py_prefix      %{_prefix}
 %define py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
 %define py_incdir      %{_includedir}/python%{py_abi}
 %define py_prefix      %{_prefix}
 %define py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
 %define py_incdir      %{_includedir}/python%{py_abi}


@@ -47,7 +47,6 @@ Patch3:               %{name}-noarch_to_datadir.patch
 Patch4:                %{name}-no_cmdline_tests.patch
 Patch5:                %{name}-makefile-location.patch
 Patch6:                libc-cloexec.patch
 Patch4:                %{name}-no_cmdline_tests.patch
 Patch5:                %{name}-makefile-location.patch
 Patch6:                libc-cloexec.patch

-Patch7:                %{name}-build.patch

 URL:           http://www.python.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: bluez-libs-devel
 URL:           http://www.python.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: bluez-libs-devel


@@ -450,7 +449,6 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

-%patch7 -p1

 
 %{__rm} -r Modules/zlib
 %{__rm} -r Modules/expat
 
 %{__rm} -r Modules/zlib
 %{__rm} -r Modules/expat


@@ -475,10 +473,11 @@ if ! grep -q "tmpfs" /proc/self/mounts; then
 fi
 
 %{__autoconf}
 fi
 
 %{__autoconf}

-CPPFLAGS="-I/usr/include/ncursesw %{rpmcppflags}"; export CPPFLAGS
+CPPFLAGS="-I/usr/include/ncursesw %{rpmcppflags} -Wall %{!?debug:-DNDEBUG=1}"; export CPPFLAGS

 %configure \
        ac_cv_posix_semaphores_enabled=yes \
        ac_cv_broken_sem_getvalue=no \
 %configure \
        ac_cv_posix_semaphores_enabled=yes \
        ac_cv_broken_sem_getvalue=no \

+       %{?with_debug:--with-pydebug} \

        --with-cxx-main="%{__cxx}" \
        --enable-shared \
        --enable-ipv6 \
        --with-cxx-main="%{__cxx}" \
        --enable-shared \
        --enable-ipv6 \


@@ -500,7 +499,7 @@ CPPFLAGS="-I/usr/include/ncursesw %{rpmcppflags}"; export CPPFLAGS
        LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %{__make} \
        LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %{__make} \

-       OPT="%{rpmcflags} -fno-caller-saves" 2>&1 | awk '
+       OPT="%{rpmcflags} %{rpmcppflags} -fno-caller-saves" 2>&1 | awk '

 BEGIN { fail = 0; logmsg = ""; }
 {
         if ($0 ~ /\*\*\* WARNING:/) {
 BEGIN { fail = 0; logmsg = ""; }
 {
         if ($0 ~ /\*\*\* WARNING:/) {


@@ -580,8 +579,6 @@ install -p Tools/i18n/pygettext.py $RPM_BUILD_ROOT%{_bindir}/pygettext%{py_ver}
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/ctypes/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/distutils/tests

-%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/email/test
-%{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/importlib/test

 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/lib2to3/tests
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/sqlite3/test
 %{__rm} -r $RPM_BUILD_ROOT%{py_scriptdir}/tkinter/test


@@ -645,12 +642,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_dyndir}/_struct.cpython-*.so
 
 # modules required by python library
 %attr(755,root,root) %{py_dyndir}/_struct.cpython-*.so
 
 # modules required by python library

-%{py_scriptdir}/_abcoll.py

 %{py_scriptdir}/_weakrefset.py
 %{py_scriptdir}/abc.py
 %{py_scriptdir}/bisect.py
 %{py_scriptdir}/codecs.py
 %{py_scriptdir}/_weakrefset.py
 %{py_scriptdir}/abc.py
 %{py_scriptdir}/bisect.py
 %{py_scriptdir}/codecs.py

-%{py_scriptdir}/collections.py

 %{py_scriptdir}/copyreg.py
 %{py_scriptdir}/functools.py
 %{py_scriptdir}/genericpath.py
 %{py_scriptdir}/copyreg.py
 %{py_scriptdir}/functools.py
 %{py_scriptdir}/genericpath.py


@@ -673,12 +668,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_scriptdir}/os.py
 # needed by the dynamic sys.lib patch
 %{py_scriptdir}/types.py
 %{py_scriptdir}/os.py
 # needed by the dynamic sys.lib patch
 %{py_scriptdir}/types.py

-%{py_scriptdir}/__pycache__/_abcoll.cpython-*.py[co]

 %{py_scriptdir}/__pycache__/_weakrefset.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/abc.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/bisect.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/codecs.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_weakrefset.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/abc.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/bisect.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/codecs.cpython-*.py[co]

-%{py_scriptdir}/__pycache__/collections.cpython-*.py[co]

 %{py_scriptdir}/__pycache__/copyreg.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/functools.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/genericpath.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/copyreg.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/functools.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/genericpath.cpython-*.py[co]


@@ -833,7 +826,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_scriptdir}/xdrlib.py
 %{py_scriptdir}/zipfile.py
 %{py_scriptdir}/__pycache__/__future__.cpython-*.py[co]
 %{py_scriptdir}/xdrlib.py
 %{py_scriptdir}/zipfile.py
 %{py_scriptdir}/__pycache__/__future__.cpython-*.py[co]

-%{py_scriptdir}/__pycache__/__phello__.foo.cpython-*.py[co]

 %{py_scriptdir}/__pycache__/_compat_pickle.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_dummy_thread.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_markupbase.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_compat_pickle.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_dummy_thread.cpython-*.py[co]
 %{py_scriptdir}/__pycache__/_markupbase.cpython-*.py[co]