fix error in spec.vim (rhbz#1318991)
This commit is contained in:
parent
ad8005f31f
commit
9c6b66d477
14
vim-7.4-releasestring-1318991.patch
Normal file
14
vim-7.4-releasestring-1318991.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
|
||||||
|
--- vim74/runtime/ftplugin/spec.vim.1318991 2016-04-26 13:01:33.781838194 +0200
|
||||||
|
+++ vim74/runtime/ftplugin/spec.vim 2016-04-26 13:02:41.958130012 +0200
|
||||||
|
@@ -40,8 +40,8 @@ else:
|
||||||
|
headers = spec.packages[0].header
|
||||||
|
version = headers['Version']
|
||||||
|
release = ".".join(headers['Release'].split(".")[:-1])
|
||||||
|
- vim.command("let ver = " + version)
|
||||||
|
- vim.command("let rel = " + release)
|
||||||
|
+ vim.command("let ver = '" + version + "'")
|
||||||
|
+ vim.command("let rel = '" + release + "'")
|
||||||
|
PYEND
|
||||||
|
endif
|
||||||
|
endfunction
|
9
vim.spec
9
vim.spec
@ -21,7 +21,7 @@ Summary: The VIM editor
|
|||||||
URL: http://www.vim.org/
|
URL: http://www.vim.org/
|
||||||
Name: vim
|
Name: vim
|
||||||
Version: %{baseversion}.%{patchlevel}
|
Version: %{baseversion}.%{patchlevel}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: Vim
|
License: Vim
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
|
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
|
||||||
@ -61,6 +61,7 @@ Patch3011: vim-manpagefixes-948566.patch
|
|||||||
Patch3012: vim-7.4-licensemacro-1151450.patch
|
Patch3012: vim-7.4-licensemacro-1151450.patch
|
||||||
Patch3013: vim-7.4-globalsyntax.patch
|
Patch3013: vim-7.4-globalsyntax.patch
|
||||||
Patch3014: vim-7.4-spec_rfc822.patch
|
Patch3014: vim-7.4-spec_rfc822.patch
|
||||||
|
Patch3015: vim-7.4-releasestring-1318991.patch
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
|
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
|
||||||
@ -213,6 +214,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|||||||
%patch3012 -p1
|
%patch3012 -p1
|
||||||
%patch3013 -p1
|
%patch3013 -p1
|
||||||
%patch3014 -p1
|
%patch3014 -p1
|
||||||
|
%patch3015 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cp -f %{SOURCE5} .
|
cp -f %{SOURCE5} .
|
||||||
@ -280,6 +282,7 @@ mv -f ex_cmds.c.save ex_cmds.c
|
|||||||
%else
|
%else
|
||||||
--disable-luainterp \
|
--disable-luainterp \
|
||||||
%endif
|
%endif
|
||||||
|
--enable-termtruecolor
|
||||||
|
|
||||||
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
||||||
cp vim gvim
|
cp vim gvim
|
||||||
@ -315,6 +318,7 @@ make clean
|
|||||||
%else
|
%else
|
||||||
--disable-luainterp \
|
--disable-luainterp \
|
||||||
%endif
|
%endif
|
||||||
|
--enable-termtruecolor
|
||||||
|
|
||||||
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
|
||||||
cp vim enhanced-vim
|
cp vim enhanced-vim
|
||||||
@ -765,6 +769,9 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 26 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1775-2
|
||||||
|
- fix error in spec.vim (rhbz#1318991)
|
||||||
|
|
||||||
* Fri Apr 22 2016 Karsten Hopp <karsten@redhat.com> 7.4.1775-1
|
* Fri Apr 22 2016 Karsten Hopp <karsten@redhat.com> 7.4.1775-1
|
||||||
- patchlevel 1775
|
- patchlevel 1775
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user