rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix ruby version check

Browse Source
This commit is contained in:
Karsten Hopp 2013-05-08 16:55:12 +02:00
parent 64f562360e
commit 19713298db
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vim-7.3-rubyversion.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up vim73/src/configure.in.rubyversion vim73/src/configure.in
--- vim73/src/configure.in.rubyversion 2013-05-08 16:21:11.067927960 +0200
+++ vim73/src/configure.in 2013-05-08 16:31:05.854534820 +0200
@@ -1490,7 +1490,10 @@ if test "$enable_rubyinterp" = "yes" -o
if test -d "$rubyhdrdir/$rubyarch"; then
RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
fi
- rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
+ rubymajor=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['MAJOR']]"`
+ rubyminor=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['MINOR']]"`
+ rubyversion="$rubymajor$rubyminor"
+ # rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"`
if test "X$rubylibs" != "X"; then

5
vim.spec
View File

@ -971,6 +971,7 @@ Patch3010: vim-7.0-specedit.patch
Patch3011: vim72-rh514717.patch
Patch3012: vim-7.3-bug816848.patch
Patch3013: vim-7.3-manpage-typo-668894-675480.patch
Patch3014: vim-7.3-rubyversion.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ncurses-devel gettext perl-devel
@ -2025,6 +2026,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3011 -p1
%patch3012 -p1
%patch3013 -p1
%patch3014 -p1
%build
cp -f %{SOURCE5} .
@ -2482,6 +2484,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Wed May 08 2013 Karsten Hopp <karsten@redhat.com> 7.3.903-1
- fix ruby version check
* Fri Apr 19 2013 Karsten Hopp <karsten@redhat.com> 7.3.903-1
- drop crv patch
- update 7.3.838 patch, it was broken upstream