[packages/vim] add x bcond

atler atler at pld-linux.org
Mon Dec 16 01:05:00 CET 2019


commit 28ce0b6b081c8f06a4b77aa427569a87f40d0380
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Dec 16 01:01:32 2019 +0100

    add x bcond

 vim.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index 6105c3c..d72f8ae 100644
--- a/vim.spec
+++ b/vim.spec
@@ -16,6 +16,7 @@
 %bcond_with	python3		# with Python 3 interp in vim package
 %bcond_with	ruby		# with Ruby interp in vim package
 %bcond_with	tcl		# with Tcl interp
+%bcond_with	x		# with X11 support
 %bcond_without	selinux		# without selinux support
 %bcond_without	home_etc	# without home_etc support
 
@@ -116,14 +117,14 @@ BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.12
 BuildRequires:	gpm-devel
 %if "%{pld_release}" == "ac"
-%if %{with athena} || %{with x11}
+%if %{with athena} || %{with x11} || %{with x}
 BuildRequires:	XFree86-devel
 %endif
 BuildRequires:	gettext-devel
 %else
 BuildRequires:	gettext-tools
 %{?with_athena:BuildRequires:	xorg-lib-libXaw-devel}
-%if %{with x11} || %{with gui}
+%if %{with x11} || %{with gui} || %{with x}
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
@@ -909,7 +910,7 @@ build vim.light \
 
 build vim.ncurses \
 	--disable-gui \
-	--without-x \
+	%{__with_without x} \
 	--disable-canberra \
 	--with-features=huge
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/28ce0b6b081c8f06a4b77aa427569a87f40d0380



More information about the pld-cvs-commit mailing list