Merge branch 'f29' into f28

.gitignore

@@ -242,3 +242,4 @@
 /vim-8.1-818.tar.bz2
 /vim-8.1-837.tar.bz2
 /vim-8.1-847.tar.bz2
+/vim-8.1-873.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.1-847.tar.bz2) = 1507b2ee8acba8067632799050b4a93ac80464ed15b782e8eeaa3917ab3f71165a59f5dbc003e51cbb6fc309fd1e1a8288b8423cafc1e5f4c0f935d19e66e0bf
+SHA512 (vim-8.1-873.tar.bz2) = e64445d7d1705b7fde720f353250bf5a93a58dfc2dca3e82ad1094db042a2d33d116b5083ab169175dd189b0b702187c64df9309123760256f4ff82893cbc73b

vim-ruby26.patch

@@ -1,28 +0,0 @@
-diff --git a/src/if_ruby.c b/src/if_ruby.c
-index 9c91f31..e53e0ef 100644
---- a/src/if_ruby.c
-+++ b/src/if_ruby.c
-@@ -476,7 +476,11 @@ static void (*dll_ruby_init_stack)(VALUE*);
- #  endif
- # endif
- # ifdef RUBY19_OR_LATER
-+#  if DYNAMIC_RUBY_VER >= 26
-+static VALUE (*dll_rb_int2big)(intptr_t);
-+#  else
- static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
-+#  endif
- # endif
- 
- # ifdef RUBY19_OR_LATER
-@@ -506,7 +510,11 @@ SIGNED_VALUE rb_num2long_stub(VALUE x)
- {
-     return dll_rb_num2long(x);
- }
-+# if DYNAMIC_RUBY_VER >= 26
-+VALUE rb_int2big_stub(intptr_t x)
-+# else
- VALUE rb_int2big_stub(SIGNED_VALUE x)
-+# endif
- {
-     return dll_rb_int2big(x);
- }

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 847
+%define patchlevel 873
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -35,7 +35,6 @@ Source7: gvim16.png
 Source8: gvim32.png
 Source9: gvim48.png
 Source10: gvim64.png
-Source11: Changelog.rpm
 %if %{withvimspell}
 Source13: vim-spell-files.tar.bz2
 %endif
@@ -67,15 +66,6 @@ Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3016: vim-8.0-copy-paste.patch
 # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
 Patch3017: vim-python3-tests.patch
-# Ruby 2.6 introduced API breakage in dll_rb_int2big() function - the function
-# had one parameter of SIGNED_VALUE type, but now it has one parameter of 
-# intptr_t type. It needed to be fixed in Vim, because it caused FTBFS on
-# i686 and armv7hl archs - the new type of parameter seems to be expanded
-# to the same amount of memory in 64b archs as the old type, but into different
-# on 32b archs.
-# Ruby upstream issue: https://bugs.ruby-lang.org/issues/15570
-# Vim upstream issue: will need to be reported
-Patch3018: vim-ruby26.patch
 
 # gcc is no longer in buildroot by default
 BuildRequires: gcc
@@ -264,7 +254,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3014 -p1
 %patch3016 -p1
 %patch3017 -p1
-%patch3018 -p1
 
 %build
 %if 0%{?rhel} > 7
@@ -397,7 +386,6 @@ cp vim enhanced-vim
 mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
-cp -f %{SOURCE11} .
 %if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 6
 cp -f %{SOURCE15} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
 %else
@@ -608,7 +596,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %license LICENSE
 %doc README*
 %doc runtime/docs
-%doc Changelog.rpm
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/vimfiles/template.spec
 %dir %{_datadir}/%{name}/%{vimdir}
@@ -812,6 +799,18 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Feb 04 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.873-1
+- patchlevel 873
+
+* Mon Feb 04 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.847-4
+- remove downstream fix for new ruby, upstream solved it different way
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.1.847-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 31 2019  Karsten Hopp <karsten@redhat.com> - 2:8.1.847-2
+- remove ancient Changelog.rpm
+
 * Wed Jan 30 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.847-2
 - fix patch for new ruby-2.6