rpms/vim/devel vim-6.4-lib64.patch,NONE,1.1 vim.spec,1.99,1.100

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Mar 9 14:38:54 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8487

Modified Files:
	vim.spec 
Added Files:
	vim-6.4-lib64.patch 
Log Message:
- fix configure check for python (#184478)

vim-6.4-lib64.patch:
 auto/configure |    2 +-
 configure.in   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vim-6.4-lib64.patch ---
--- vim64/src/auto/configure.lib64	2005-10-15 14:55:10.000000000 +0200
+++ vim64/src/auto/configure	2006-03-09 15:23:39.000000000 +0100
@@ -1813,7 +1813,7 @@
   
 	vi_cv_path_python_conf=
 	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-	  for subdir in lib share; do
+	  for subdir in lib64 lib share; do
 	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
 	    if test -d "$d" && test -f "$d/config.c"; then
 	      vi_cv_path_python_conf="$d"
--- vim64/src/configure.in.lib64	2006-03-09 15:24:07.000000000 +0100
+++ vim64/src/configure.in	2006-03-09 15:24:47.000000000 +0100
@@ -472,7 +472,7 @@
       [
 	vi_cv_path_python_conf=
 	for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
-	  for subdir in lib share; do
+	  for subdir in lib64 lib share; do
 	    d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
 	    if test -d "$d" && test -f "$d/config.c"; then
 	      vi_cv_path_python_conf="$d"


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vim.spec	9 Mar 2006 12:30:33 -0000	1.99
+++ vim.spec	9 Mar 2006 14:38:51 -0000	1.100
@@ -25,7 +25,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 3
+Release: 4
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -71,6 +71,7 @@
 Patch3008: vim-6.4-cvim.patch
 Patch3009: vim-6.4-checkhl.patch
 Patch3010: vim-6.4-fstabsyntax.patch
+Patch3011: vim-6.4-lib64.patch
 
 Patch3100: vim-selinux.patch
 
@@ -151,7 +152,7 @@
 Summary: The VIM version of the vi editor for the X Window System.
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr
-BuildRequires: gtk2-devel
+BuildRequires: gtk2-devel libSM-devel libXt-devel
 Prereq: gtk2 >= 2.6
 
 %description X11
@@ -203,6 +204,7 @@
 
 %patch3009 -p1
 %patch3010 -p1
+%patch3011 -p1
 
 %if %{WITH_SELINUX}
 %patch3100 -p1
@@ -489,6 +491,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-4
+- fix configure check for python (#184478)
+
 * Thu Mar 09 2006 Karsten Hopp <karsten at redhat.de> 6.4.007-3
 - rebuild
 




More information about the fedora-cvs-commits mailing list