use %make_build and %make_install according FPG

This commit is contained in:
Zdenek Dohnal 2020-07-22 09:03:36 +02:00
parent 93c00dba0c
commit 5a31767e1d

View File

@ -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: 2%{?dist} Release: 3%{?dist}
License: Vim and MIT License: Vim and MIT
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
Source1: vim.sh Source1: vim.sh
@ -291,7 +291,7 @@ perl -pi -e "s/vimrc/virc/" os_unix.h
--enable-fips-warning \ --enable-fips-warning \
--enable-fail-if-missing --enable-fail-if-missing
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} %make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
cp vim minimal-vim cp vim minimal-vim
make clean make clean
@ -335,7 +335,7 @@ mv -f ex_cmds.c.save ex_cmds.c
%endif %endif
--enable-fail-if-missing --enable-fail-if-missing
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} %make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
cp vim gvim cp vim gvim
make clean make clean
@ -371,7 +371,7 @@ make clean
%endif %endif
--enable-fail-if-missing --enable-fail-if-missing
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags} %make_build VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
cp vim enhanced-vim cp vim enhanced-vim
%install %install
@ -388,7 +388,7 @@ cd src
# Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself # Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself
# and put the stripped files into correct dirs. Build system (koji/brew) # and put the stripped files into correct dirs. Build system (koji/brew)
# does it for us, so there is no need to do it in Vim # does it for us, so there is no need to do it in Vim
make install DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true %make_install BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} STRIP=/bin/true
make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
install -m755 minimal-vim %{buildroot}%{_bindir}/vi install -m755 minimal-vim %{buildroot}%{_bindir}/vi
@ -775,6 +775,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/* %{_datadir}/icons/locolor/*/apps/*
%changelog %changelog
* Wed Jul 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-3
- use %%make_build and %%make_install according FPG
* Thu Jul 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-2 * Thu Jul 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1224-2
- proper fix for python3 dynamic linking - proper fix for python3 dynamic linking