commit swig for openSUSE:Factory

21 Dec 2012

Hello community,

here is the log from the commit of package swig for openSUSE:Factory checked in at 2012-12-21 10:36:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swig (Old)
 and      /work/SRC/openSUSE:Factory/.swig.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "swig", Maintainer is "MMarek@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:Factory/swig/swig.changes	2012-11-12 11:44:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.swig.new/swig.changes	2012-12-21 10:36:05.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Dec 17 12:52:34 UTC 2012 - kkaempf@suse.com
+
+- Update to SWIG 2.0.9
+  SWIG-2.0.9 summary:
+  - Improved typemap matching.
+  - Ruby 1.9 support is much improved.
+  - Various bug fixes and minor improvements in C#, CFFI, Go, Java,
+    Modula3, Octave, Perl, Python, R, Ruby, Tcl and in ccache-swig.
+
+- Removed patches (included in 2.0.9 release)
+  - 0001-Ruby-replace-obsolete-STR2CSTR-macro-with-StringValu.patch
+  - 0002-Ruby-use-RbConfig-instead-of-deprecated-Config-modul.patch
+  - 0003-Ruby-Fix-include-pathes-for-Ruby-1.9.patch
+  - 0004-Ruby-Add-local-dir-to-loadpath-for-Ruby-1.9.patch
+  - 0007-Ruby-1.9-methods-returns-array-of-Symbols-now.patch
+
+- Removed broken patch
+  - swig-2.0.4-guile2.patch
+
+- Disable tests failing on (deprecated) Python 2.4
+  - new patch: python-2.4.patch
+
+-------------------------------------------------------------------
+Mon Nov  5 09:57:55 UTC 2012 - kkaempf@suse.com
+
+- fix build on SLE10: disable autogen.sh
+  Add patch: PyInt_FromSize_t unavailable under Python 2.4
+
+-------------------------------------------------------------------

Old:
----
  0001-Ruby-replace-obsolete-STR2CSTR-macro-with-StringValu.patch
  0002-Ruby-use-RbConfig-instead-of-deprecated-Config-modul.patch
  0003-Ruby-Fix-include-pathes-for-Ruby-1.9.patch
  0004-Ruby-Add-local-dir-to-loadpath-for-Ruby-1.9.patch
  0007-Ruby-1.9-methods-returns-array-of-Symbols-now.patch
  swig-2.0.4-guile2.patch
  swig-2.0.8.tar.gz

New:
----
  python-2.4.patch
  skip-python-li_std_containers_int.patch
  swig-2.0.9.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ swig.spec ++++++
--- /var/tmp/diff_new_pack.pVWDBS/_old	2012-12-21 10:36:07.000000000 +0100
+++ /var/tmp/diff_new_pack.pVWDBS/_new	2012-12-21 10:36:07.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           swig
-Version:        2.0.8
+Version:        2.0.9
 Release:        0
 Summary:        Simplified Wrapper and Interface Generator
 License:        GPL-3.0+ and BSD-3-Clause
@@ -25,20 +25,14 @@
 Url:            http://www.swig.org/
 Source:         http://sourceforge.net/projects/swig/files/swig/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.rpmlintrc
-# PATCH-FIX-UPSTREAM swig-2.0.4-guile2.patch pgajdos@suse.com -- generate guile 2 friendly code
-Patch:          swig-2.0.4-guile2.patch
-# PATCH-PENDING-UPSTREAM - 3530439 - kkaempf@suse.de
-Patch1:         0001-Ruby-replace-obsolete-STR2CSTR-macro-with-StringValu.patch
-# PATCH-PENDING-UPSTREAM - 3530440 - kkaempf@suse.de
-Patch2:         0002-Ruby-use-RbConfig-instead-of-deprecated-Config-modul.patch
-# PATCH-PENDING-UPSTREAM - 3530442 - kkaempf@suse.de
-Patch3:         0003-Ruby-Fix-include-pathes-for-Ruby-1.9.patch
-# PATCH-PENDING-UPSTREAM - 3530443 - kkaempf@suse.de
-Patch4:         0004-Ruby-Add-local-dir-to-loadpath-for-Ruby-1.9.patch
-# PATCH-PENDING-UPSTREAM - 3530444 - kkaempf@suse.de
-Patch5:         0007-Ruby-1.9-methods-returns-array-of-Symbols-now.patch
+# Disable test failing on Python 2.4
+Patch5:         python-2.4.patch
+# Disable tests failing on Ruby 1.9
 Patch6:         0008-Ruby-Disable-broken-tests.patch
+# Disable test failing in Python
 Patch7:         0012-Python-Disable-broken-test-in-threads_exception.patch
+# Test fails in openSUSE 12.1 only
+Patch8:         skip-python-li_std_containers_int.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  boost-devel
@@ -53,7 +47,11 @@
 %if 0%{?fedora} + 0%{?rhel_version} + 0%{?centos_version} > 0
 %define docpath %{_docdir}/%{name}-%{version}
 BuildRequires:  pkgconfig
+BuildRequires:  ruby
+%if (0%{?rhel_version} < 600) && (0%{?centos_version} < 600)
+# not available on RHEL-6
 BuildRequires:  ruby-devel
+%endif
 %if 0%{?rhel_version} + 0%{?centos_version} == 0
 BuildRequires:  perl-devel
 %endif
@@ -127,39 +125,22 @@
 
 %prep
 %setup -q
-# guile 2 from 12.1
-%patch -p1
 # Ruby 1.9 from 12.1
-%if 0%{?suse_version} >= 1210
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%if 0%{?suse_version} == 1010
 %patch5 -p1
+%endif
+%if 0%{?suse_version} >= 1210
 %patch6 -p1
-%patch7 -p1
+%patch8 -p1
 %endif
+%patch7 -p1
 
 %build
-sh autogen.sh
 %configure --disable-ccache
 make %{?_smp_mflags}
 
 %check
-# check fails on SLES9
-%if 0%{?sles_version} != 9
-# This test is buggy on x86-64
-%if 0%{?suse_version} == 1010
-%ifarch x86_64
-# This test fails on SLES 10 SP3+SP4 on 64bit (bnc#750618)
-rm -f Examples/test-suite/ruby/newobject1_runme.rb
-%endif
-%endif
-# Segfaults
-rm -f Examples/test-suite/python/li_std_containers_int_runme.py
-rm -f Examples/test-suite/python/li_boost_shared_ptr_runme.py
 make check
-%endif
 
 %install
 make install DESTDIR=%{buildroot}

++++++ 0008-Ruby-Disable-broken-tests.patch ++++++
--- /var/tmp/diff_new_pack.pVWDBS/_old	2012-12-21 10:36:07.000000000 +0100
+++ /var/tmp/diff_new_pack.pVWDBS/_new	2012-12-21 10:36:07.000000000 +0100
@@ -1,17 +1,7 @@
-From 7fa5330f2610e8b4574bf7ba4670f8ed1a446b6e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
-Date: Sat, 26 May 2012 21:42:08 +0200
-Subject: [PATCH 08/10] Ruby: Disable broken tests
-
----
- Examples/test-suite/ruby/Makefile.in |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in
-index e11e581..3a8af5c 100644
---- a/Examples/test-suite/ruby/Makefile.in
-+++ b/Examples/test-suite/ruby/Makefile.in
-@@ -14,18 +14,18 @@ CPP_TEST_CASES = \
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-swig-2.0.9_svn13971/Examples/test-suite/ruby/Makefile.in ./Examples/test-suite/ruby/Makefile.in
+--- ../orig-swig-2.0.9_svn13971/Examples/test-suite/ruby/Makefile.in	2012-12-14 15:07:32.956499000 +0100
++++ ./Examples/test-suite/ruby/Makefile.in	2012-12-16 14:13:30.024200036 +0100
+@@ -14,18 +14,18 @@
  	li_cdata \
  	li_cstring \
  	li_factory \
@@ -29,11 +19,8 @@
 -	std_containers
 +	ruby_track_objects_directors
 +#	std_containers
-+#	li_std_set
 +#	li_std_functors
++#	li_std_set
  #	ruby_li_std_speed
  #	stl_new
  
--- 
-1.7.9.2
-

++++++ python-2.4.patch ++++++
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-swig-2.0.8/Examples/test-suite/python/autodoc_runme.py ./Examples/test-suite/python/autodoc_runme.py
--- ../orig-swig-2.0.8/Examples/test-suite/python/autodoc_runme.py	2012-04-15 23:56:38.000000000 +0200
+++ ./Examples/test-suite/python/autodoc_runme.py	2012-12-12 14:04:02.873907051 +0100
@@ -121,23 +121,6 @@
 "        "
 )
 
-check(A.variable_a.__doc__, "A_variable_a_get(self) -> int")
-check(A.variable_b.__doc__, "A_variable_b_get(A self) -> int")
-check(A.variable_c.__doc__, "\n"
-"A_variable_c_get(self) -> int\n"
-"\n"
-"Parameters:\n"
-"    self: A *\n"
-"\n"
-)
-check(A.variable_d.__doc__, "\n"
-"A_variable_d_get(A self) -> int\n"
-"\n"
-"Parameters:\n"
-"    self: A *\n"
-"\n"
-)
-
 check(B.__doc__, "Proxy of C++ B class")
 check(C.__init__.__doc__, "__init__(self, a, b, h) -> C")
 check(D.__init__.__doc__, "__init__(D self, int a, int b, Hola h) -> D")
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-swig-2.0.8/Lib/python/pyhead.swg ./Lib/python/pyhead.swg
--- ../orig-swig-2.0.8/Lib/python/pyhead.swg	2012-08-15 09:48:57.000000000 +0200
+++ ./Lib/python/pyhead.swg	2012-12-11 13:21:24.686950170 +0100
@@ -18,6 +18,10 @@
 
 #endif
 
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 4
+#define PyInt_FromSize_t(x) PyInt_FromLong((long)x)
+#endif 
+
 #ifndef Py_TYPE
 #  define Py_TYPE(op) ((op)->ob_type)
 #endif
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile ../orig-swig-2.0.9/Examples/test-suite/python/Makefile.in ./Examples/test-suite/python/Makefile.in
--- ../orig-swig-2.0.9/Examples/test-suite/python/Makefile.in	2012-04-14 23:11:19.000000000 +0200
+++ ./Examples/test-suite/python/Makefile.in	2012-12-18 16:23:46.138238704 +0100
@@ -46,7 +46,6 @@
 	li_cwstring \
 	li_factory \
 	li_implicit \
-	li_std_containers_int \
 	li_std_map_member \
 	li_std_multimap \
 	li_std_pair_extra \
@@ -69,6 +68,7 @@
 	swigobject \
 	template_matrix
 
+#	li_std_containers_int
 #	li_std_carray
 #	director_profile
 #	python_pybuf
++++++ skip-python-li_std_containers_int.patch ++++++
diff -wruN -x '*~' ../orig-swig-2.0.9/Examples/test-suite/python/Makefile.in ./Examples/test-suite/python/Makefile.in
--- ../orig-swig-2.0.9/Examples/test-suite/python/Makefile.in	2012-04-14 23:11:19.000000000 +0200
+++ ./Examples/test-suite/python/Makefile.in	2012-12-19 15:12:29.072322715 +0100
@@ -46,7 +46,6 @@
 	li_cwstring \
 	li_factory \
 	li_implicit \
-	li_std_containers_int \
 	li_std_map_member \
 	li_std_multimap \
 	li_std_pair_extra \
@@ -69,6 +68,7 @@
 	swigobject \
 	template_matrix
 
+#	li_std_containers_int
 #	li_std_carray
 #	director_profile
 #	python_pybuf
++++++ swig-2.0.8.tar.gz -> swig-2.0.9.tar.gz ++++++
++++ 15721 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)