|
@@ -1,10 +1,11 @@
|
|
# version, patch version
|
|
# version, patch version
|
|
-%define vimversion 8.0
|
|
+%define vimversion 8.2
|
|
-%define vimsrcpversion 586
|
|
+%define vimsrcpversion 0365
|
|
-%define vimpversion 599
|
|
+%define vimpversion 0365
|
|
|
|
|
|
%define vimsubdir vim%(echo %{vimversion} | sed -e's/\\.//')
|
|
%define vimsubdir vim%(echo %{vimversion} | sed -e's/\\.//')
|
|
-%define vimdir %{vimsubdir}
|
|
+#define vimdir %{vimsubdir}
|
|
|
|
+%define vimdir vim-%{vimversion}.%{vimsrcpversion}
|
|
|
|
|
|
%define binprefix /
|
|
%define binprefix /
|
|
%define x11prefix /usr
|
|
%define x11prefix /usr
|
|
@@ -12,7 +13,7 @@
|
|
%define vimruntime %{_datadir}/vim
|
|
%define vimruntime %{_datadir}/vim
|
|
|
|
|
|
%define configopts --bindir='${exec_prefix}/bin' --disable-gpm
|
|
%define configopts --bindir='${exec_prefix}/bin' --disable-gpm
|
|
-%define features_x11 --exec-prefix=%{_prefix} --with-x=yes --enable-gui=gtk2 --enable-xim --enable-fontset
|
|
+%define features_x11 --exec-prefix=%{_prefix} --with-x=yes --enable-gtk3-check --enable-gui=gtk3 --enable-xim --enable-fontset
|
|
%define features_nox11 --exec-prefix=%{_prefix} --with-x=no --enable-gui=no
|
|
%define features_nox11 --exec-prefix=%{_prefix} --with-x=no --enable-gui=no
|
|
%define features_huge --with-features=huge --enable-multibyte --enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-luainterp
|
|
%define features_huge --with-features=huge --enable-multibyte --enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-luainterp
|
|
%define features_big --with-features=big --enable-multibyte
|
|
%define features_big --with-features=big --enable-multibyte
|
|
@@ -25,19 +26,19 @@ Summary(ja): Vi IMproved - 改良された vi エディタ
|
|
Name: vim
|
|
Name: vim
|
|
License: Vim
|
|
License: Vim
|
|
Group: Applications/Editors
|
|
Group: Applications/Editors
|
|
-URL: http://www.vim.org/
|
|
+URL: https://www.vim.org/
|
|
|
|
|
|
%if %{vimpversion}
|
|
%if %{vimpversion}
|
|
Version: %{vimversion}.%{vimpversion}
|
|
Version: %{vimversion}.%{vimpversion}
|
|
%else
|
|
%else
|
|
Version: %{vimversion}
|
|
Version: %{vimversion}
|
|
%endif
|
|
%endif
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
|
|
|
|
-Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{vimversion}.%{vimsrcpversion}.tar.bz2
|
|
+Source0: https://github.com/vim/vim/archive/v%{vimversion}.%{vimsrcpversion}.tar.gz#/vim-%{vimversion}.%{vimsrcpversion}.tar.bz2
|
|
|
|
|
|
# gvim desktop file
|
|
# gvim desktop file
|
|
Source100: gvim.desktop
|
|
Source100: gvim.desktop
|
|
@@ -56,41 +57,36 @@ Source500: template.spec.vine
|
|
Patch2002: vim-7.0-fixkeys.patch
|
|
Patch2002: vim-7.0-fixkeys.patch
|
|
Patch2003: vim-8.0-specsyntax.patch
|
|
Patch2003: vim-8.0-specsyntax.patch
|
|
|
|
|
|
-# Patches 1000 and up are patches from the base maintainer.
|
|
+# Patches 2000 and up are patches from the base maintainer.
|
|
# If you're as lazy as me, generate the list using
|
|
# If you're as lazy as me, generate the list using
|
|
# for i in seq 1 154; do printf "Patch%04d: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.%04d\n" $i $i; done > vimpatches
|
|
# for i in seq 1 154; do printf "Patch%04d: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.%04d\n" $i $i; done > vimpatches
|
|
-Patch0587: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0587
|
|
+
|
|
-Patch0588: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0588
|
|
+# nothing
|
|
-Patch0589: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0589
|
|
|
|
-Patch0590: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0590
|
|
|
|
-Patch0591: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0591
|
|
|
|
-Patch0592: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0592
|
|
|
|
-Patch0593: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0593
|
|
|
|
-Patch0594: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0594
|
|
|
|
-Patch0595: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0595
|
|
|
|
-Patch0596: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0596
|
|
|
|
-Patch0597: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0597
|
|
|
|
-Patch0598: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0598
|
|
|
|
-Patch0599: ftp://ftp.vim.org/pub/vim/patches/8.0/8.0.0599
|
|
|
|
|
|
|
|
Patch2010: xxd-locale.patch
|
|
Patch2010: xxd-locale.patch
|
|
|
|
|
|
|
|
+
|
|
Patch3000: vim-7.4-syntax.patch
|
|
Patch3000: vim-7.4-syntax.patch
|
|
-Patch3002: vim-7.1-nowarnings.patch
|
|
+Patch3002: vim-7.4-nowarnings.patch
|
|
-Patch3003: vim-6.1-rh3.patch
|
|
+Patch3004: vim-7.0-rclocation.patch
|
|
-#Patch3004: vim-7.0-rclocation.patch
|
|
|
|
-Patch3006: vim-8.0-checkhl.patch
|
|
|
|
Patch3007: vim-7.4-fstabsyntax.patch
|
|
Patch3007: vim-7.4-fstabsyntax.patch
|
|
-Patch3009: vim-7.0-warning.patch
|
|
+Patch3008: vim-7.4-syncolor.patch
|
|
-Patch3010: vim-7.0-syncolor.patch
|
|
+Patch3010: vim-7.3-manpage-typo-668894-675480.patch
|
|
-Patch3011: vim-8.0-specedit.patch
|
|
+Patch3011: vim-manpagefixes-948566.patch
|
|
|
|
+Patch3013: vim-7.4-globalsyntax.patch
|
|
|
|
+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
|
|
|
|
+# fips warning
|
|
|
|
+Patch3018: vim-crypto-warning.patch
|
|
|
|
|
|
Patch4000: vim-7.2-fix-menu.patch
|
|
Patch4000: vim-7.2-fix-menu.patch
|
|
|
|
|
|
# Patch4010: vim-7.3-enable-syntax.patch
|
|
# Patch4010: vim-7.3-enable-syntax.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
-BuildRequires: ruby, ruby-devel, python-devel, perl, gtk2-devel, ncurses-devel, autoconf, libtool, net-tools, pixman-devel, libXt-devel
|
|
+BuildRequires: ruby, ruby-devel, python-devel, perl, gtk3-devel, ncurses-devel, autoconf, libtool, net-tools, pixman-devel, libXt-devel
|
|
BuildRequires: lua-devel
|
|
BuildRequires: lua-devel
|
|
%if "%{?_dist_release}" != "vl5"
|
|
%if "%{?_dist_release}" != "vl5"
|
|
BuildRequires: glibc-static
|
|
BuildRequires: glibc-static
|
|
@@ -260,7 +256,7 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
|
|
Summary: The common files needed by any version of the GVIM editor
|
|
Summary: The common files needed by any version of the GVIM editor
|
|
Summary(ja): X11 対応 VIM エディタに必要な共通ファイル
|
|
Summary(ja): X11 対応 VIM エディタに必要な共通ファイル
|
|
Group: Applications/Editors
|
|
Group: Applications/Editors
|
|
-Requires: vim-common = %{version}, gtk2
|
|
+Requires: vim-common = %{version}, gtk3
|
|
Requires(post): desktop-file-utils
|
|
Requires(post): desktop-file-utils
|
|
Requires(postun): desktop-file-utils
|
|
Requires(postun): desktop-file-utils
|
|
|
|
|
|
@@ -346,33 +342,25 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|
|
|
|
|
# Base patches...
|
|
# Base patches...
|
|
# for i in seq 1 154; do printf "%%patch%04d -p0\n" $i; done
|
|
# for i in seq 1 154; do printf "%%patch%04d -p0\n" $i; done
|
|
-%patch0587 -p0
|
|
+
|
|
-%patch0588 -p0
|
|
+# nothing
|
|
-%patch0589 -p0
|
|
+
|
|
-%patch0590 -p0
|
|
|
|
-#%patch0591 -p0
|
|
|
|
-%patch0592 -p0
|
|
|
|
-%patch0593 -p0
|
|
|
|
-%patch0594 -p0
|
|
|
|
-%patch0595 -p0
|
|
|
|
-%patch0596 -p0
|
|
|
|
-%patch0597 -p0
|
|
|
|
-%patch0598 -p0
|
|
|
|
-%patch0599 -p0
|
|
|
|
|
|
|
|
%patch2010 -p1
|
|
%patch2010 -p1
|
|
|
|
|
|
%patch3000 -p1
|
|
%patch3000 -p1
|
|
%patch3002 -p1
|
|
%patch3002 -p1
|
|
-%patch3003 -p1
|
|
+%patch3004 -p1
|
|
-#%patch3004 -p1
|
|
+%patch3007 -p1 -b .fstabsyntax
|
|
-
|
|
+%patch3008 -p1 -b .syncolor
|
|
-%patch3006 -p1
|
|
|
|
-%patch3007 -p1
|
|
|
|
-#%patch3008 -p1
|
|
|
|
-%patch3009 -p1
|
|
|
|
%patch3010 -p1
|
|
%patch3010 -p1
|
|
%patch3011 -p1
|
|
%patch3011 -p1
|
|
|
|
+%patch3013 -p1
|
|
|
|
+%patch3014 -p1
|
|
|
|
+%patch3016 -p1 -b .copypaste
|
|
|
|
+%patch3017 -p1
|
|
|
|
+%patch3018 -p1
|
|
|
|
+
|
|
|
|
|
|
%patch4000 -p1
|
|
%patch4000 -p1
|
|
# %patch4010 -p1
|
|
# %patch4010 -p1
|
|
@@ -381,6 +369,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|
cd src
|
|
cd src
|
|
autoconf
|
|
autoconf
|
|
|
|
|
|
|
|
+sed -e "s+VIMRCLOC = \$(VIMLOC)+VIMRCLOC = /etc+" Makefile > Makefile.tmp
|
|
|
|
+mv -f Makefile.tmp Makefile
|
|
|
|
+
|
|
|
|
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
|
|
|
|
+export CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
|
|
|
|
+
|
|
make shadow
|
|
make shadow
|
|
mv shadow vim-X11-huge
|
|
mv shadow vim-X11-huge
|
|
(cd vim-X11-huge && \
|
|
(cd vim-X11-huge && \
|
|
@@ -685,9 +679,8 @@ rm -rf %{buildroot}
|
|
|
|
|
|
%files common
|
|
%files common
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%doc README.txt
|
|
+%license LICENSE
|
|
-%doc README_extra.txt
|
|
+%doc README*
|
|
-%doc README_unix.txt
|
|
|
|
%{vimrcloc}
|
|
%{vimrcloc}
|
|
%{_bindir}/vimtutor
|
|
%{_bindir}/vimtutor
|
|
%{_bindir}/xxd
|
|
%{_bindir}/xxd
|
|
@@ -722,6 +715,13 @@ rm -rf %{buildroot}
|
|
%{_mandir}/ja/man1/vimdiff.1.gz
|
|
%{_mandir}/ja/man1/vimdiff.1.gz
|
|
%{_mandir}/ja/man1/vimtutor.1.gz
|
|
%{_mandir}/ja/man1/vimtutor.1.gz
|
|
%{_mandir}/ja/man1/xxd.1.gz
|
|
%{_mandir}/ja/man1/xxd.1.gz
|
|
|
|
+%{_mandir}/da.ISO8859-1
|
|
|
|
+%{_mandir}/da.UTF-8
|
|
|
|
+
|
|
|
|
+%exclude %{_mandir}/da
|
|
|
|
+%exclude %{_mandir}/de.ISO8859-1
|
|
|
|
+%exclude %{_mandir}/de.UTF-8
|
|
|
|
+%exclude %{_mandir}/de
|
|
|
|
|
|
%files X11-common
|
|
%files X11-common
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
@@ -759,6 +759,12 @@ rm -rf %{buildroot}
|
|
%{_bindir}/vim.X11-huge
|
|
%{_bindir}/vim.X11-huge
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.0365-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- updated fedora patches.
|
|
|
|
+- updated .spec template for Vine Linux.
|
|
|
|
+- switched gui to gtk3.
|
|
|
|
+
|
|
* Mon May 20 2019 Toshiaki Ara <ara_t@384.jp> 8.0.599-2
|
|
* Mon May 20 2019 Toshiaki Ara <ara_t@384.jp> 8.0.599-2
|
|
- rebuild with perl-5.26
|
|
- rebuild with perl-5.26
|
|
|
|
|