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 openpkg-web Date: 17-Sep-2003 14:39:18
Branch: HEAD Handle: 2003091713391701
Modified files:
openpkg-src/graphviz graphviz.spec
openpkg-web news.txt
Log:
add optional X11 support for being able to use 'lefty'
Summary:
Revision Changes Path
1.39 +17 -1 openpkg-src/graphviz/graphviz.spec
1.6599 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 graphviz.spec
--- openpkg-src/graphviz/graphviz.spec 8 Jul 2003 14:39:52 -0000 1.38
+++ openpkg-src/graphviz/graphviz.spec 17 Sep 2003 12:39:18 -0000 1.39
@@ -33,7 +33,10 @@
Group: Graphics
License: GPL
Version: 1.10
-Release: 20030704
+Release: 20030917
+
+# package options
+%option with_x11 yes
# list of sources
Source0:
http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-%{version}.tar.gz
@@ -44,6 +47,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, freetype, png, jpeg, gcc, make, flex,
bison
PreReq: OpenPKG, openpkg >= 20020206, freetype, png, jpeg
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
AutoReq: no
AutoReqProv: no
@@ -74,7 +81,13 @@
--with-jpeglibdir=%{l_prefix}/lib \
--without-tclsh \
--without-wish \
+%if "%{with_x11}" == "yes"
+ --with-x \
+ --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+%else
--without-x \
+%endif
--disable-shared \
--enable-static
%{l_make} %{l_mflags}
@@ -83,6 +96,9 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
+%if "%{with_x11}" != "yes"
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/graphviz/lefty
+%endif
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6598 -r1.6599 news.txt
--- openpkg-web/news.txt 17 Sep 2003 12:38:57 -0000 1.6598
+++ openpkg-web/news.txt 17 Sep 2003 12:39:17 -0000 1.6599
@@ -1,3 +1,4 @@
+17-Sep-2003: Upgraded package: P<graphviz-1.10-20030917>
17-Sep-2003: Upgraded package: P<dsh-0.25.0-20030917>
17-Sep-2003: Upgraded package: P<cadaver-0.22.0-20030917>
17-Sep-2003: Upgraded package: P<sdl-1.2.6-20030917>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
