From 071ee1d47ab55dfd9c70f9dd8498c61890d787bdce92fff9a538d74d28623392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 6 Nov 2011 08:57:45 +0000
Subject: [PATCH] Accepting request 90166 from home:elvigia:branches:editors

Intended for 12.1 and factory, plz forward accordingly.

- vim-enhanced,gvim: Never ever link against static libpython
  this happends because %{_libdir}/python$vesion/config is
  searched first and picks libpython.a instead of .so ...

OBS-URL: https://build.opensuse.org/request/show/90166
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=66
---
 vim.changes                     |  8 ++++++++
 vim.spec                        |  6 ++++++
 vim73-no-static-libpython.patch | 11 +++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 vim73-no-static-libpython.patch

diff --git a/vim.changes b/vim.changes
index 0ffb8a9..f26c418 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Nov  6 03:49:09 UTC 2011 - crrodriguez@opensuse.org
+
+- vim-enhanced,gvim: Never ever link against static libpython
+  this happends because %{_libdir}/python$vesion/config is
+  searched first and picks libpython.a instead of .so ...
+
+
 -------------------------------------------------------------------
 Tue Oct 18 17:16:30 CEST 2011 - dmueller@suse.de
 
diff --git a/vim.spec b/vim.spec
index d40cf0d..5dc1519 100644
--- a/vim.spec
+++ b/vim.spec
@@ -112,6 +112,7 @@ Patch22:        %{name}-7.3-filetype_mine.patch
 Patch25:        vim-7.2-lzma-support.patch
 Patch27:        %{name}-7.3-disable_gcc_warning_eval_c.patch
 Patch100:       vim-7.1.314-CVE-2009-0316-debian.patch
+Patch101:       vim73-no-static-libpython.patch
 
 %description
 Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@@ -277,6 +278,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 #%patch25
 %patch27 -p1
 %patch100 -p1
+%patch101
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} .
 #rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
 #rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
@@ -314,6 +316,10 @@ export GUI_OPTIONS="\
     --enable-gtk2-check \
     --with-gtk-prefix=/opt/gnome \
     --with-gnome=/opt/gnome"
+
+pushd src
+autoconf 
+popd
 #
 # build small default binary
 %configure \
diff --git a/vim73-no-static-libpython.patch b/vim73-no-static-libpython.patch
new file mode 100644
index 0000000..1819641
--- /dev/null
+++ b/vim73-no-static-libpython.patch
@@ -0,0 +1,11 @@
+--- src/configure.in.orig
++++ src/configure.in
+@@ -881,7 +881,7 @@ eof
+ 	      if test "${vi_cv_var_python_version}" = "1.4"; then
+ 		  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
+ 	      else
+-		  vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
++		  vi_cv_path_python_plibs="-lpython${vi_cv_var_python_version}"
+ 	      fi
+ 	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+ 	      dnl remove -ltermcap, it can conflict with an earlier -lncurses