OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Jul-2003 13:48:23
Branch: HEAD Handle: 2003070812482101
Modified files:
openpkg-src/gnuplot gnuplot.spec
openpkg-web news.txt
Log:
add optional X11 support
Summary:
Revision Changes Path
1.10 +15 -1 openpkg-src/gnuplot/gnuplot.spec
1.5438 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnuplot/gnuplot.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 gnuplot.spec
--- openpkg-src/gnuplot/gnuplot.spec 17 Jan 2003 07:40:50 -0000 1.9
+++ openpkg-src/gnuplot/gnuplot.spec 8 Jul 2003 11:48:22 -0000 1.10
@@ -33,7 +33,10 @@
Group: Graphics
License: GPL
Version: 3.7.3
-Release: 20030117
+Release: 20030708
+
+# package options
+%option with_x11 no
# list of sources
Source0: ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-%{version}.tar.gz
@@ -43,6 +46,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, png, zlib, readline, ncurses
PreReq: OpenPKG, openpkg >= 20020206, png, zlib, readline, ncurses
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
AutoReq: no
AutoReqProv: no
@@ -67,7 +74,13 @@
--with-readline=%{l_prefix} \
--with-png=%{l_prefix} \
--without-gd \
+%if "%{with_x11}" == "yes"
+ --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+ --with-x
+%else
--without-x
+%endif
%{l_make} %{l_mflags -O}
%install
@@ -77,6 +90,7 @@
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
datadir=$RPM_BUILD_ROOT%{l_prefix}/share/gnuplot
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT/info/dir
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5437 -r1.5438 news.txt
--- openpkg-web/news.txt 8 Jul 2003 09:44:05 -0000 1.5437
+++ openpkg-web/news.txt 8 Jul 2003 11:48:21 -0000 1.5438
@@ -1,3 +1,4 @@
+08-Jul-2003: Upgraded package: P<gnuplot-3.7.3-20030708>
08-Jul-2003: New package: P<kcd-7.0.0-20030708>
08-Jul-2003: Upgraded package: P<ghostscript-8.10-20030708>
08-Jul-2003: Upgraded package: P<rt-3.0.3-20030708>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]