From 3f13abb69e54427df95e2b011d573c82777ffcba Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Nov 06 2019 17:15:16 +0000 Subject: do not add python-libs into LDFLAGS until we build vim and gvim --- diff --git a/vim.spec b/vim.spec index 6424da7..c1d1491 100644 --- a/vim.spec +++ b/vim.spec @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -267,12 +267,6 @@ 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" -%if 0%{?fedora} > 31 -export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" -%else -export LDFLAGS="%{build_ldflags} $(python3-config --libs)" -%endif - cp -f os_unix.h os_unix.h.save cp -f ex_cmds.c ex_cmds.c.save @@ -311,6 +305,12 @@ make clean mv -f os_unix.h.save os_unix.h mv -f ex_cmds.c.save ex_cmds.c +%if 0%{?fedora} > 31 +export LDFLAGS="%{build_ldflags} $(python3-config --libs --embed)" +%else +export LDFLAGS="%{build_ldflags} $(python3-config --libs)" +%endif + # More configure options: # --enable-xim - enabling X Input Method - international input module for X, # it is for multibyte languages in Vim with X @@ -797,6 +797,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Wed Nov 06 2019 Zdenek Dohnal - 2:8.1.2234-2 +- do not add python-libs into LDFLAGS until we build vim and gvim + * Wed Oct 30 2019 Zdenek Dohnal - 2:8.1.2234-1 - patchlevel 2234