SPECS: brltty.spec - x bcond - BR: ncurses-devel

sls sls at pld-linux.org
Sat Jan 5 11:29:49 CET 2008


Author: sls                          Date: Sat Jan  5 10:29:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- x bcond
- BR: ncurses-devel

---- Files affected:
SPECS:
   brltty.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/brltty.spec
diff -u SPECS/brltty.spec:1.20 SPECS/brltty.spec:1.21
--- SPECS/brltty.spec:1.20	Sat Jan  5 10:50:46 2008
+++ SPECS/brltty.spec	Sat Jan  5 11:29:43 2008
@@ -13,6 +13,7 @@
 %bcond_with	ocaml		# ocaml bindings (NFY)
 %bcond_without	python		# python bindings
 %bcond_without	tcl		# tcl bindings
+%bcond_without	x		# build X11-based utilities
 #
 Summary:	Braille display driver for Linux/Unix
 Summary(pl.UTF-8):	Sterownik do wyświetlaczy Braille'a
@@ -32,13 +33,14 @@
 #BuildRequires:	gpm-devel
 %{?with_java:BuildRequires:	jdk}
 #BuildRequires:	libusb-devel
-#BuildRequires:	ncurses-devel
+BuildRequires:	ncurses-devel
 %{?with_ocaml:BuildRequires:	ocaml}
 #BuildRequires:	pkgconfig
 %{?with_python:BuildRequires:	python-Pyrex}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 %{?with_tcl:BuildRequires:	tcl}
-#BuildRequires:	xorg-lib-libX*
+%{?with_x:BuildRequires:	xorg-lib-libXaw-devel}
+%{?with_x:BuildRequires:	xorg-lib-libXtst-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -170,6 +172,7 @@
 %{__aclocal}
 %{__autoconf}
 cp -f /usr/share/automake/config.sub acdir
+CFLAGS="-I/usr/include/ncurses"
 %configure \
 	--with-install-root="$RPM_BUILD_ROOT" \
 	--disable-tainted-components \
@@ -479,7 +482,7 @@
 %attr(755,root,root) %{_bindir}/brltty-install
 %attr(755,root,root) %{_bindir}/brltty-config
 %attr(755,root,root) %{_bindir}/vstp
-#attr(755,root,root) %{_bindir}/xbrlapi
+%{?with_x:%attr(755,root,root) %{_bindir}/xbrlapi}
 %dir %{_libdir}/brltty
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybal.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybat.so
@@ -506,6 +509,7 @@
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybvo.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybvr.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttybvs.so
+%{?with_x:%attr(755,root,root) %{_libdir}/brltty/libbrlttybxw.so}
 %attr(755,root,root) %{_libdir}/brltty/libbrlttysal.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttysbl.so
 %attr(755,root,root) %{_libdir}/brltty/libbrlttyscb.so
@@ -571,6 +575,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008-01-05 10:29:43  sls
+- x bcond
+- BR: ncurses-devel
+
 Revision 1.20  2008-01-05 09:50:46  sls
 - python and tcl bconds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/brltty.spec?r1=1.20&r2=1.21&f=u



More information about the pld-cvs-commit mailing list