Merge branch 'f25' into f26

This commit is contained in:
Zdenek Dohnal 2017-10-31 12:33:54 +01:00
commit c82bc3d630
3 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View File

@ -132,3 +132,4 @@
/vim-8.0-1216.tar.bz2
/vim-8.0-1226.tar.bz2
/vim-8.0-1238.tar.bz2
/vim-8.0-1240.tar.bz2

View File

@ -1 +1 @@
SHA512 (vim-8.0-1238.tar.bz2) = 68927095dc369185a962c4a9bab3bcbfb443d5f1581837bd38e78e0edf754165dc853c8d20fbf808af66abfb492ca1ae9be07545135c749494a1ee18b4afc7bb
SHA512 (vim-8.0-1240.tar.bz2) = c7d9d8735564f8ca515896ccb7fb522375d267b3f58000175cba4fc12c48f0df5ab59fbfd37e7c736074bfbe9c9a3d292c5493ce82656fd27795cab8fcded5fa

View File

@ -1,4 +1,4 @@
%define patchlevel 1238
%define patchlevel 1240
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
%define WITH_SELINUX 1
%endif
@ -773,6 +773,9 @@ rm -rf %{buildroot}
%{_datadir}/icons/locolor/*/apps/*
%changelog
* Tue Oct 31 2017 Karsten Hopp <karsten@redhat.com> 8.0.1240-1
- patchlevel 1240
* Mon Oct 30 2017 Karsten Hopp <karsten@redhat.com> 8.0.1238-1
- patchlevel 1238