From 2490144c239b77d7cbb9035094fd69d1a9205928 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 11 Jan 2024 18:05:06 +0100 Subject: [PATCH] rework configure options to remove deps on gui and canberra, restore gvim build, obsolete vim-tiny [release 9.1.0016-2mamba;Wed Jan 10 2024] --- vim.spec | 70 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/vim.spec b/vim.spec index 08efc5a..c00cfb5 100644 --- a/vim.spec +++ b/vim.spec @@ -2,11 +2,11 @@ ## *AUTOSPEC-OFF* %define vimdir %{name}%(majversion=%majversion; echo ${majversion/\./}) ## *AUTOSPEC-ON* -%define with_gvim 0 +%define with_gvim 1 Name: vim Version: 9.1.0016 -Release: 1mamba +Release: 2mamba Summary: VIsual editor iMproved Group: Applications/Text Vendor: openmamba @@ -18,16 +18,25 @@ Source2: vimrc-skel License: Charityware ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libICE-devel +BuildRequires: libSM-devel +BuildRequires: libX11-devel +BuildRequires: libXt-devel +BuildRequires: libacl-devel +BuildRequires: libcairo-devel BuildRequires: libcanberra-devel +BuildRequires: libgdk-pixbuf-devel +BuildRequires: libglib-devel BuildRequires: libgpm-devel +BuildRequires: libgtk3-devel BuildRequires: libncurses-devel -BuildRequires: libperl -BuildRequires: libruby-devel +BuildRequires: libpango-devel BuildRequires: libselinux-devel BuildRequires: libsodium-devel -BuildRequires: libtcl-devel ## AUTOBUILDREQ-END BuildRequires: gettext-devel +Provides: vim-tiny +Obsoletes: vim-tiny <= 9.0.2190-1mamba %description VIM (VIsual editor iMproved) is an updated and improved version of the vi editor. @@ -93,23 +102,23 @@ src/os_unix.h #LOCALEDIR=%{localedir} \ %configure \ - --with-compiledby="%{packager}" \ --with-features=huge \ + --with-compiledby="%{_vendor}" \ + --enable-gpm \ + --enable-acl \ --with-x=yes \ - --enable-gui=gnome2 \ - --enable-gtk2-check \ - --enable-xim \ - --enable-fontset \ - --enable-nls \ - --enable-perlinterp \ - --enable-pythoninterp \ - --enable-tclinterp \ --with-tclsh=%{_bindir}/tclsh \ - --enable-rubyinterp \ + --enable-gui=gtk3 \ + --enable-multibyte \ --enable-cscope \ - --disable-acl \ - --enable-multibyte - + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic \ + --enable-canberra + # disable the '-g' option %make && mv src/vim src/gvim @@ -120,19 +129,23 @@ mv src/vim src/gvim # build vim #LOCALEDIR=%{localedir} \ %configure \ - --with-compiledby="%{packager}" \ + --with-compiledby="%{_vendor}" \ --with-features=huge \ + --enable-gpm \ + --enable-acl \ --with-x=no \ - --enable-gui=no \ - --enable-nls \ - --enable-perlinterp \ - --enable-pythoninterp \ - --enable-tclinterp \ - --enable-rubyinterp \ --with-tclsh=%{_bindir}/tclsh \ + --disable-gui \ + --enable-multibyte \ + --enable-nls \ --enable-cscope \ - --disable-acl \ - --enable-multibyte + --enable-netbeans \ + --enable-perlinterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp=dynamic \ + --enable-luainterp=dynamic \ + --enable-tclinterp=dynamic \ + --disable-canberra #sed -i ' # s,LOCALEDIR=$(DEST_LANG),LOCALEDIR=$(DESTDIR)$(prefix)/share/locale,g' \ @@ -204,6 +217,9 @@ install -m 0755 -D src/gvim %{buildroot}%{_bindir}/gvim %{_mandir}/man1/vimtutor.1* %changelog +* Wed Jan 10 2024 Silvan Calarco 9.1.0016-2mamba +- rework configure options to remove deps on gui and canberra, restore gvim build, obsolete vim-tiny + * Tue Jan 09 2024 Automatic Build System 9.1.0016-1mamba - automatic version update by autodist