[swig] Update to 2.0.3.
Adam Tkac
atkac at fedoraproject.org
Fri Apr 22 13:53:25 UTC 2011
commit e37152b0e84ec2d109f057694c4bd4704c5268c4
Author: Adam Tkac <atkac at redhat.com>
Date: Fri Apr 22 15:52:54 2011 +0200
Update to 2.0.3.
- swig202-rh691513.patch merged
Signed-off-by: Adam Tkac <atkac at redhat.com>
.gitignore | 1 +
sources | 2 +-
swig.spec | 10 ++-
swig200-rh666429.patch | 30 ++++----
swig202-rh691513.patch | 212 ------------------------------------------------
5 files changed, 23 insertions(+), 232 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2cb3ffe..069d38e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
swig-2.0.0.tar.gz
/swig-2.0.1.tar.gz
/swig-2.0.2.tar.gz
+/swig-2.0.3.tar.gz
diff --git a/sources b/sources
index 319fa8d..444aca8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaf619a4169886923e5f828349504a29 swig-2.0.2.tar.gz
+e548ea3882b994c4907d6be86bef90f2 swig-2.0.3.tar.gz
diff --git a/swig.spec b/swig.spec
index 11d55d1..462233b 100644
--- a/swig.spec
+++ b/swig.spec
@@ -3,8 +3,8 @@
Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig
-Version: 2.0.2
-Release: 2%{?dist}
+Version: 2.0.3
+Release: 1%{?dist}
License: GPLv3+ and BSD
Group: Development/Tools
URL: http://swig.sourceforge.net/
@@ -12,7 +12,6 @@ Source: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-
Patch1: swig-1.3.23-pylib.patch
Patch2: swig200-rh623854.patch
Patch3: swig200-rh666429.patch
-Patch4: swig202-rh691513.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl, python-devel, pcre-devel
@@ -47,7 +46,6 @@ This package contains documentation for SWIG and useful examples
%patch1 -p1 -b .pylib
%patch2 -p1 -b .rh623854
%patch3 -p1 -b .rh666429
-%patch4 -p1 -b .rh691513
# as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2
# (specific req/prov filtering). Before you remove this hack make sure you don't
@@ -119,6 +117,10 @@ rm -rf %{buildroot}
%doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
%changelog
+* Fri Apr 22 2011 Adam Tkac <atkac redhat com> 2.0.3-1
+- update to 2.0.3
+- swig202-rh691513.patch merged
+
* Tue Mar 29 2011 Adam Tkac <atkac redhat com> 2.0.2-2
- bacport fix for preprocessor regression (#691513)
diff --git a/swig200-rh666429.patch b/swig200-rh666429.patch
index 31dbe7f..c4ca3f1 100644
--- a/swig200-rh666429.patch
+++ b/swig200-rh666429.patch
@@ -1,7 +1,7 @@
-diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/pycontainer.swg
---- swig-2.0.1/Lib/python/pycontainer.swg.rh666429 2011-02-16 12:25:19.277091696 +0100
-+++ swig-2.0.1/Lib/python/pycontainer.swg 2011-02-16 12:48:43.273926091 +0100
-@@ -631,6 +631,7 @@ namespace swig
+diff -up swig-2.0.3/Lib/python/pycontainer.swg.rh666429 swig-2.0.3/Lib/python/pycontainer.swg
+--- swig-2.0.3/Lib/python/pycontainer.swg.rh666429 2010-10-19 08:31:31.000000000 +0200
++++ swig-2.0.3/Lib/python/pycontainer.swg 2011-04-22 15:42:42.185982189 +0200
+@@ -630,6 +630,7 @@ namespace swig
return x;
}
@@ -9,7 +9,7 @@ diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/py
/* typemap for slice object support */
%typemap(in) PySliceObject* {
$1 = (PySliceObject *) $input;
-@@ -638,6 +639,7 @@ namespace swig
+@@ -637,6 +638,7 @@ namespace swig
%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* {
$1 = PySlice_Check($input);
}
@@ -17,7 +17,7 @@ diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/py
Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range) {
return swig::getslice(self, i, j);
-@@ -660,7 +662,11 @@ namespace swig
+@@ -659,7 +661,11 @@ namespace swig
/* Overloaded methods for Python 3 compatibility
* (Also useful in Python 2.x)
*/
@@ -29,7 +29,7 @@ diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/py
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
SWIG_Error(SWIG_TypeError, "Slice object expected.");
-@@ -669,8 +675,11 @@ namespace swig
+@@ -668,8 +674,11 @@ namespace swig
PySlice_GetIndices(slice, self->size(), &i, &j, &step);
return swig::getslice(self, i, j);
}
@@ -42,7 +42,7 @@ diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/py
throw (std::out_of_range, std::invalid_argument) {
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
-@@ -681,7 +690,11 @@ namespace swig
+@@ -680,7 +689,11 @@ namespace swig
swig::setslice(self, i, j, v);
}
@@ -54,14 +54,14 @@ diff -up swig-2.0.1/Lib/python/pycontainer.swg.rh666429 swig-2.0.1/Lib/python/py
throw (std::out_of_range) {
Py_ssize_t i, j, step;
if( !PySlice_Check(slice) ) {
-diff -up swig-2.0.1/Source/Modules/python.cxx.rh666429 swig-2.0.1/Source/Modules/python.cxx
---- swig-2.0.1/Source/Modules/python.cxx.rh666429 2011-02-16 12:20:37.557740471 +0100
-+++ swig-2.0.1/Source/Modules/python.cxx 2011-02-16 12:46:29.034224445 +0100
-@@ -440,6 +440,7 @@ public:
+diff -up swig-2.0.3/Source/Modules/python.cxx.rh666429 swig-2.0.3/Source/Modules/python.cxx
+--- swig-2.0.3/Source/Modules/python.cxx.rh666429 2011-03-14 08:22:08.000000000 +0100
++++ swig-2.0.3/Source/Modules/python.cxx 2011-04-22 15:43:45.122661120 +0200
+@@ -438,6 +438,7 @@ public:
if (py3) {
- /* force disable features that not compatible with Python 3.x */
- classic = 0;
-+ Preprocessor_define((DOH *) "NO_PYSLICE 1", 0);
+ /* force disable features that not compatible with Python 3.x */
+ classic = 0;
++ Preprocessor_define((DOH *) "NO_PYSLICE 1", 0);
}
if (cppcast) {
More information about the scm-commits
mailing list