- added guile2 patch (fixes compiling of guile modules with guile 2 headers)

- release 2

Changed files:
    swig-guile2.patch -> 1.1
    swig.spec -> 1.105

diff --git a/swig-guile2.patch b/swig-guile2.patch
new file mode 100644 (file)
index 0000000..df2d1ce
--- /dev/null
+++ b/swig-guile2.patch
@@ -0,0 +1,28 @@
+--- swig-2.0.2/Lib/guile/guile_scm_run.swg.orig        2010-02-28 00:26:02.000000000 +0100
++++ swig-2.0.2/Lib/guile/guile_scm_run.swg     2011-05-18 20:28:49.077624577 +0200
+@@ -12,7 +12,11 @@
+ extern "C" {
+ #endif
+ 
++#if SCM_MAJOR_VERSION >= 2
++typedef scm_t_subr swig_guile_proc;
++#else
+ typedef SCM (*swig_guile_proc)();
++#endif
+ typedef SCM (*guile_destructor)(SCM);
+ 
+ typedef struct swig_guile_clientdata {
+--- swig-2.0.2/Lib/guile/guile_gh_run.swg.orig 2010-02-28 00:26:02.000000000 +0100
++++ swig-2.0.2/Lib/guile/guile_gh_run.swg      2011-05-18 20:28:35.984290806 +0200
+@@ -15,7 +15,11 @@
+ extern "C" {
+ #endif
+ 
++#if SCM_MAJOR_VERSION >= 2
++typedef scm_t_subr swig_guile_proc;
++#else
+ typedef SCM (*swig_guile_proc)();
++#endif
+ 
+ #define SWIG_malloc(size) \
+   SCM_MUST_MALLOC(size)

diff --git a/swig.spec b/swig.spec
index 6a7a563a3348bb1a60b7f910fa0b40bb3331a231..7c9a8d761f6b5d20e31cd91626fd8b1f7884bb59 100644 (file)
--- a/swig.spec
+++ b/swig.spec
@@ -13,12 +13,13 @@ Summary(pl.UTF-8):  Generator interfejsów do Perla, Tcl-a, Guile'a i Pythona
 Summary(pt_BR.UTF-8):  Gerador de Interfaces e "Wrappers" Simplificado (SWIG)
 Name:          swig
 Version:       2.0.2
-Release:       1
+Release:       2
 License:       GPL v3+ (utility), free (library)
 Group:         Development/Languages
 Source0:       http://downloads.sourceforge.net/swig/%{name}-%{version}.tar.gz
 # Source0-md5: eaf619a4169886923e5f828349504a29
 Patch0:                %{name}-php-freearg.patch
+Patch1:                %{name}-guile2.patch
 URL:           http://www.swig.org/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1:1.7.2
@@ -158,6 +159,7 @@ Biblioteka SWIG: tcl.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I Tools/config