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: 14-Jan-2005 17:37:43
Branch: HEAD Handle: 2005011416374300
Modified files:
openpkg-src/graphviz graphviz.spec
Log:
fontconfig is an X11-only feature
Summary:
Revision Changes Path
1.53 +6 -6 openpkg-src/graphviz/graphviz.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 graphviz.spec
--- openpkg-src/graphviz/graphviz.spec 14 Jan 2005 12:45:16 -0000
1.52
+++ openpkg-src/graphviz/graphviz.spec 14 Jan 2005 16:37:43 -0000
1.53
@@ -56,11 +56,11 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, flex, bison
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: freetype, fontconfig, png, jpeg, gd
-PreReq: freetype, fontconfig, png, jpeg, gd
+BuildPreReq: freetype, png, jpeg, gd
+PreReq: freetype, png, jpeg, gd
%if "%{with_x11}" == "yes"
-BuildPreReq: X11
-PreReq: X11
+BuildPreReq: X11, fontconfig
+PreReq: X11, fontconfig
%endif
%if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-sys, perl-openpkg
@@ -109,8 +109,6 @@
--prefix=%{l_prefix} \
--with-extraincludedir=%{l_prefix}/include \
--with-extralibdir=%{l_prefix}/lib \
- --with-fontconfigincludedir=%{l_prefix}/include \
- --with-fontconfiglibdir=%{l_prefix}/lib \
--with-freetypeincludedir=%{l_prefix}/include \
--with-freetypelibdir=%{l_prefix}/lib \
--with-pngincludedir=%{l_prefix}/include \
@@ -127,6 +125,8 @@
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
+ --with-fontconfigincludedir=%{l_prefix}/include \
+ --with-fontconfiglibdir=%{l_prefix}/lib \
%else
--without-x \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
