ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/graphviz.spec
(Generate patch)

Comparing COMP/CMSDIST/graphviz.spec (file contents):
Revision 1.20 by eulisse, Wed Jan 23 14:20:15 2008 UTC vs.
Revision 1.25 by andreasp, Tue May 19 09:01:05 2009 UTC

# Line 11 | Line 11 | LIB64_SUFFIX=
11   case %cmsplatf in
12      *_ia32_* )
13          export LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e 's|lib64|lib|g'`
14 <        ADDITIONAL_OPTIONS="--without-freetype --disable-shared --enable-static --disable-libtdl"
14 >        ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-libtdl"
15      ;;
16      *_amd64_* )
17          LIB64_SUFFIX=64
18 <        ADDITIONAL_OPTIONS="--without-freetype --disable-shared --enable-static --disable-libtdl"
18 >        ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-ltdl"
19      ;;
20      osx* )
21 <        ADDITIONAL_OPTIONS=
21 >        ADDITIONAL_OPTIONS="--with-freetype2=no"
22      ;;
23   esac
24   ./configure \
# Line 26 | Line 26 | esac
26    --with-expatincludedir=$EXPAT_ROOT/include \
27    --with-zincludedir=$ZLIB_ROOT/include \
28    --with-zlibdir=$ZLIB_ROOT/lib \
29 <  --with-pngincludedir=$LIBJPG_ROOT/include \
30 <  --with-pnglibdir=$LIBJPG_ROOT/lib \
31 <  --with-jpegincludedir=$LIBPNG_ROOT/include \
32 <  --with-jpeglibdir=$LIBPNG_ROOT/lib \
29 >  --with-pngincludedir=$LIBPNG_ROOT/include \
30 >  --with-pnglibdir=$LIBPNG_ROOT/lib \
31 >  --with-jpegincludedir=$LIBJPG_ROOT/include \
32 >  --with-jpeglibdir=$LIBJPG_ROOT/lib \
33    --without-x \
34    --without-tclsh \
35    --without-tcl \
# Line 62 | Line 62 | perl -p -i -e "s|\+0 \-1|-k1,1|g" dotnea
62   fi
63   # Probably the configure should just be remade on Darwin, but it builds
64   # as-is with this small cleanup
65 – %ifos darwin
65   perl -p -i -e "s|-lexpat||g" configure
66 < %endif
67 < make %makeprocesses
66 > # make %makeprocesses
67 > make
68  
69   %install
70   make install
71 < ln -s dot_static %i/bin/dot
71 > # To match configure options above
72 > case %cmsplatf in
73 >    *_ia32_* | *_amd64_*)
74 >        ln -s dot_static %i/bin/dot
75 >    ;;
76 > esac
77  
78   # SCRAM ToolBox toolfile
79   mkdir -p %i/etc/scram.d

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines