OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Oct-2004 10:11:51
Branch: HEAD Handle: 2004100909115100
Modified files:
openpkg-src/r r.spec
Log:
build with X11 interface by default but allow it to be disabled
Summary:
Revision Changes Path
1.4 +16 -2 openpkg-src/r/r.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/r/r.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 r.spec
--- openpkg-src/r/r.spec 8 Oct 2004 07:22:47 -0000 1.3
+++ openpkg-src/r/r.spec 9 Oct 2004 08:11:51 -0000 1.4
@@ -34,7 +34,10 @@
Group: Algorithm
License: GPL
Version: 2.0.0
-Release: 20041008
+Release: 20041009
+
+# package options
+%option with_x11 yes
# list of sources
Source0: http://cran.r-project.org/src/base/R-2/R-%{version}.tar.gz
@@ -46,6 +49,10 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: readline, png, jpeg, zlib, bzip2, pcre
PreReq: readline, png, jpeg, zlib, bzip2, pcre
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
AutoReq: no
AutoReqProv: no
@@ -88,7 +95,14 @@
--with-jpeglib \
--with-zlib \
--with-bzlib \
- --with-pcre
+ --with-pcre \
+%if "%{with_x11}" == "yes"
+ --with-x \
+ --x-includes=`%{l_rc} --query x11_incdir` \
+ --x-libraries=`%{l_rc} --query x11_libdir`
+%else
+ --without-x
+%endif
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
