- (#233523: libboost_python needs rebuild against python 2.5) Use patch.

Mon Mar 26 2007 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-11
- (#225622: Merge Review: boost) Source to http. BuildRoot to preferred
    value. PreReq to post/postun -p Clarified BSL as GPL-Compatible, Free
    Software License. Remove Obsoletes. Add Provides boost-python. Remove
    mkdir -p $RPM_BUILD_ROOT%{_docdir} Added periods for decription text.
    Fix Group field. Remove doc Requires boost. Preserve timestamps on
    install. Use %defattr(-, root, root, -) Added static package for .a
    libs. Install static libs with 0644 permissions. Use %doc for doc
    files.
This commit is contained in:
Benjamin Kosnik 2007-03-26 16:25:34 +00:00
parent dff01fc376
commit e509989d1f
2 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,37 @@
--- boost/python/detail/wrap_python.hpp 4 Nov 2005 21:38:29 -0000 1.22
+++ boost/python/detail/wrap_python.hpp 12 Apr 2006 15:55:11 -0000
@@ -141,6 +141,12 @@
# include <Python.h>
#endif
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#define PY_SSIZE_T_MIN INT_MIN
+#define PY_SSIZE_T_MAX INT_MAX
+#endif
+
#ifdef BOOST_PYTHON_ULONG_MAX_UNDEFINED
# undef ULONG_MAX
# undef BOOST_PYTHON_ULONG_MAX_UNDEFINED
diff -u -r1.7 object_protocol.cpp
--- libs/python/src/object_protocol.cpp 26 Jul 2004 00:32:11 -0000 1.7
+++ libs/python/src/object_protocol.cpp 12 Apr 2006 15:55:31 -0000
@@ -106,7 +106,7 @@
PySequenceMethods *sq = tp->tp_as_sequence;
if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
- int ilow = 0, ihigh = INT_MAX;
+ Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
if (!_PyEval_SliceIndex(v, &ilow))
return NULL;
if (!_PyEval_SliceIndex(w, &ihigh))
@@ -133,7 +133,7 @@
PySequenceMethods *sq = tp->tp_as_sequence;
if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
- int ilow = 0, ihigh = INT_MAX;
+ Py_ssize_t ilow = 0, ihigh = PY_SSIZE_T_MAX;
if (!_PyEval_SliceIndex(v, &ilow))
return -1;
if (!_PyEval_SliceIndex(w, &ihigh))

View File

@ -1,7 +1,7 @@
Name: boost Name: boost
Summary: The Boost C++ Libraries Summary: The Boost C++ Libraries
Version: 1.33.1 Version: 1.33.1
Release: 11%{?dist} Release: 12%{?dist}
License: Boost Software License (GPL-Compatible, Free Software License) License: Boost Software License (GPL-Compatible, Free Software License)
URL: http://www.boost.org/ URL: http://www.boost.org/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -27,6 +27,7 @@ Patch5: boost-serialization-warnings.patch
Patch6: boost-spirit-warnings.patch Patch6: boost-spirit-warnings.patch
Patch7: boost-bind-gcc41.patch Patch7: boost-bind-gcc41.patch
Patch8: boost-cxxflags-debug.patch Patch8: boost-cxxflags-debug.patch
Patch9: boost-python-vs-x86-64.patch
%description %description
Boost provides free peer-reviewed portable C++ source libraries. The Boost provides free peer-reviewed portable C++ source libraries. The
@ -76,6 +77,7 @@ rm -rf %{buildroot}
%patch6 -p0 %patch6 -p0
%patch7 -p0 %patch7 -p0
%patch8 -p0 %patch8 -p0
%patch9 -p0
%build %build
#build bjam #build bjam
@ -181,8 +183,11 @@ rm -rf %{buildroot}
%doc %{_docdir}/boost-%{version} %doc %{_docdir}/boost-%{version}
%changelog %changelog
* Mon Mar 26 2007 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-11 * Mon Mar 26 2007 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-12
- (#233523: libboost_python needs rebuild against python 2.5) - (#233523: libboost_python needs rebuild against python 2.5)
Use patch.
* Mon Mar 26 2007 Benjamin Kosnik <bkoz@redhat.com> 1.33.1-11
- (#225622: Merge Review: boost) - (#225622: Merge Review: boost)
Source to http. Source to http.
BuildRoot to preferred value. BuildRoot to preferred value.