Martin Pluskal 2017-03-21 08:18:32 +00:00 committed by Git OBS Bridge
parent f8c6b603c2
commit 65f4ad9651
2 changed files with 44 additions and 44 deletions

View File

@ -2,6 +2,7 @@
Mon Mar 20 16:46:58 CET 2017 - kukuk@suse.de
- Disable term=xxx test, does not work with any vim version
* vim-8.0-ttytype-test.patch
-------------------------------------------------------------------
Sun Mar 19 20:55:16 UTC 2017 - suse-beta@cboltz.de

View File

@ -20,48 +20,11 @@
%define patchlevel 0425
%define patchlevel_compact 425
%define VIM_SUBDIR vim80
%define site_runtimepath /usr/share/vim/site
%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags}
%define site_runtimepath %{_datadir}/vim/site
%define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags}
Name: vim
Version: %{pkg_version}.%{patchlevel_compact}
Release: 0
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
BuildRequires: gettext-devel
BuildRequires: gpm-devel
BuildRequires: gtk3-devel
%if 0%{?suse_version} > 1200
BuildRequires: pkgconfig(xt)
%endif
BuildRequires: krb5-mini
BuildRequires: libacl-devel
BuildRequires: lua-devel
BuildRequires: ncurses-devel
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: python3-devel
# Needed to convert svg to png
BuildRequires: rsvg-view
BuildRequires: ruby-devel
BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: fileutils
PreReq: sh-utils
Requires(post): update-alternatives
Requires(preun): update-alternatives
%{?libperl_requires}
Provides: vi
Provides: vim-base = %{version}-%{release}
Provides: vim-enhanced = %{version}-%{release}
Provides: vim-python = %{version}-%{release}
Obsoletes: vim-base < %{version}-%{release}
Obsoletes: vim-enhanced < %{version}-%{release}
Obsoletes: vim-python < %{version}-%{release}
Provides: vim_client
Recommends: vim-data = %{version}-%{release}
Summary: Vi IMproved
License: Vim
Group: Productivity/Editors/Vi
@ -96,6 +59,42 @@ Patch21: %{name}-7.3-filetype_changes.patch
Patch22: %{name}-7.4-filetype_mine.patch
Patch23: vim-8.0-ttytype-test.patch
Patch100: vim73-no-static-libpython.patch
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
BuildRequires: gettext-devel
BuildRequires: gpm-devel
BuildRequires: gtk3-devel
BuildRequires: krb5-mini
BuildRequires: libacl-devel
BuildRequires: lua-devel
BuildRequires: ncurses-devel
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: python3-devel
# Needed to convert svg to png
BuildRequires: rsvg-view
BuildRequires: ruby-devel
BuildRequires: update-desktop-files
PreReq: fileutils
PreReq: sh-utils
Requires(post): update-alternatives
Requires(preun): update-alternatives
Recommends: vim-data = %{version}-%{release}
Provides: vi
Provides: vim-base = %{version}-%{release}
Provides: vim-enhanced = %{version}-%{release}
Provides: vim-python = %{version}-%{release}
Obsoletes: vim-base < %{version}-%{release}
Obsoletes: vim-enhanced < %{version}-%{release}
Obsoletes: vim-python < %{version}-%{release}
Provides: vim_client
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?libperl_requires}
%if 0%{?suse_version} > 1200
BuildRequires: pkgconfig(xt)
%endif
%description
Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@ -107,10 +106,10 @@ file name completion, block operations, and editing of binary data.
%package data
Summary: Vi IMproved
Group: Productivity/Editors/Vi
BuildArch: noarch
# Used to be in vim-plugins package
Obsoletes: vim-plugin-matchit <= 1.13.2
Provides: vim-plugin-matchit = 1.13.2
BuildArch: noarch
%description data
This package contains optional runtime & syntax files for vim.
@ -120,6 +119,8 @@ Summary: A GUI for Vi
Group: Productivity/Editors/Vi
Requires: gvim_client
Requires: vim-data = %{version}-%{release}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: gvim-base = %{version}-%{release}
Provides: gvim-enhanced = %{version}-%{release}
Obsoletes: gvim-base < %{version}-%{release}
@ -127,8 +128,6 @@ Obsoletes: gvim-enhanced < %{version}-%{release}
Provides: gvim_client
Provides: vi
Provides: vim_client
Requires(post): update-alternatives
Requires(preun): update-alternatives
%description -n gvim
Package gvim contains the largest set of features of vim, which is
@ -216,7 +215,7 @@ gcc %{optflags} %{SOURCE13} -o vitmp
for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do
SIZE=$(echo $size | awk -Fx {'print $2}')
install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps
rsvg-convert -h ${SIZE} -w ${SIZE} %{S:24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png
rsvg-convert -h ${SIZE} -w ${SIZE} %{SOURCE24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png
done
install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/gvim.svg
@ -317,7 +316,7 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c
rm %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/demoserver.py
# Create ghost files (see vim.conf)
mkdir -p %{buildroot}/var/run/vi.recover
mkdir -p %{buildroot}%{_localstatedir}/run/vi.recover
%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang
%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor