drop unused ruby patch, enable xsubpp patch

This commit is contained in:
Karsten Hopp 2013-08-13 12:03:20 +02:00
parent 80fa3aaffe
commit b656c4c03f
2 changed files with 2 additions and 19 deletions

View File

@ -1,15 +0,0 @@
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

View File

@ -62,8 +62,7 @@ Patch3009: vim-7.0-syncolor.patch
Patch3010: vim-7.0-specedit.patch Patch3010: vim-7.0-specedit.patch
Patch3011: vim72-rh514717.patch Patch3011: vim72-rh514717.patch
Patch3012: vim-7.3-manpage-typo-668894-675480.patch Patch3012: vim-7.3-manpage-typo-668894-675480.patch
Patch3013: vim-7.3-rubyversion.patch Patch3013: vim-7.3-xsubpp-path.patch
Patch3014: vim-7.3-xsubpp-path.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ncurses-devel gettext perl-devel BuildRequires: python-devel ncurses-devel gettext perl-devel
@ -214,10 +213,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3010 -p1 %patch3010 -p1
%patch3011 -p1 %patch3011 -p1
%patch3012 -p1 %patch3012 -p1
#patch3013 -p1
%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7 %if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
#patch3014 -p1 %patch3013 -p1
%endif %endif
%build %build