diff --git a/vim-autoupdate b/vim-autoupdate deleted file mode 100644 index f3319bf..0000000 --- a/vim-autoupdate +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# by Silvan Calarco - -VIM_VERSION=$1 - -if [ -z "$VIM_VERSION" ]; then - echo "Usage: $0 " - exit 2 -fi - -rm -rf vim-$VIM_VERSION -mkdir vim-$VIM_VERSION -cd vim-$VIM_VERSION -MAJVER=`echo $VIM_VERSION | cut -d. -f1-2` -wget ftp://ftp.vim.org/pub/vim/patches/$MAJVER/$MAJVER.* -tar -cz $MAJVER.* > ../vim-$VIM_VERSION-patchset.tar.gz -rm -rf vim-$VIM_VERSION diff --git a/vim.spec b/vim.spec index 89fe6d8..ffbaee2 100644 --- a/vim.spec +++ b/vim.spec @@ -6,7 +6,7 @@ %define with_gvim 0 Name: vim -Version: 8.0.0237 +Version: 8.1.0354 Release: 1mamba Summary: VIsual editor iMproved Group: Applications/Text @@ -14,21 +14,22 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.vim.org/ -Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{majversion}.tar.bz2 +Source: https://github.com/vim/vim.git/v%{version}/vim-%{version}.tar.bz2 +#Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{majversion}.tar.bz2 #Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{langversion}-lang.tar.gz Source2: vimrc-skel # patches got from: ftp://ftp.vim.org/pub/vim/patches/%{majversion} # create full patches archive with vim-patches.sh script below -Source3: %{name}-%{version}-patchset.tar.gz -Source4: vim-autoupdate +#Source3: %{name}-%{version}-patchset.tar.gz +#Source4: vim-autoupdate License: Charityware ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libgpm-devel BuildRequires: libncurses-devel +BuildRequires: libperl BuildRequires: libselinux-devel BuildRequires: libtcl-devel -BuildRequires: perl-devel BuildRequires: ruby-devel ## AUTOBUILDREQ-END BuildRequires: perl-devel >= 2:5.8.7 @@ -68,25 +69,25 @@ If you install this package, you can run VIM as an X application with a full GUI This package provides tutorial files. %prep -%setup -q -n %{vimdir} +%setup -q -# apply big patches -mkdir patches -cd patches -tar xf %{SOURCE3} -cd .. -ls patches/| sort -V | while read f; do - [ "$f" = "8.0.0001" -o "$f" = "8.0.0002" -o "$f" = "8.0.0014" ] && { - cat patches/$f | patch -p0 -f || true - continue - } - cat patches/$f | patch -p0 -done +## apply big patches +#mkdir patches +#cd patches +#tar xf %{SOURCE3} +#cd .. +#ls patches/| sort -V | while read f; do +# [ "$f" = "8.0.0001" -o "$f" = "8.0.0002" -o "$f" = "8.0.0014" ] && { +# cat patches/$f | patch -p0 -f || true +# continue +# } +# cat patches/$f | patch -p0 +#done %define _use_internal_dependency_generator 0 # Find requires modified -%define __find_requires %{_builddir}/%{vimdir}/find_requires.sh +%define __find_requires %{_builddir}/%{name}-%{version}/find_requires.sh # Find requires will ignore datadir files to avoid a wrong /bin/csh requirement cat > find_requires.sh << _EOF @@ -172,12 +173,12 @@ install -m 0644 -D %{S:2} %{buildroot}/root/.vimrc install -m 0755 -D src/gvim %{buildroot}%{_bindir}/gvim %endif -#%find_lang %{name} +%find_lang %{name} --with-man --all-name %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%files +%files -f %{name}.lang %defattr(-,root,root) %{_sysconfdir}/skel/.vimrc %{_bindir}/* @@ -190,12 +191,6 @@ install -m 0755 -D src/gvim %{buildroot}%{_bindir}/gvim %{_datadir}/icons/locolor/*/apps/gvim.png %{_datadir}/icons/hicolor/*/apps/gvim.png %{_mandir}/man1/* -%lang(fr) %{_mandir}/fr*/man1/ -%lang(it) %{_mandir}/it*/man1/ -%lang(ja) %{_mandir}/ja/man1/ -%lang(it) %{_mandir}/it*/man1/ -%lang(pl) %{_mandir}/pl*/man1/ -%lang(ru) %{_mandir}/ru*/man1/ %if %{with_gvim} %{_bindir}/gvim %endif @@ -210,6 +205,9 @@ install -m 0755 -D src/gvim %{buildroot}%{_bindir}/gvim %{_datadir}/vim/%{vimdir}/tutor %changelog +* Sun Sep 09 2018 Silvan Calarco 8.1.0354-1mamba +- update to 8.1.0354 + * Sat Jan 28 2017 Automatic Build System 8.0.0237-1mamba - automatic version update by autodist