Author: sparky                       Date: Mon Mar  1 18:28:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ruby 1.9 include dirs, builds now
- BR: R (but left unpackaged)

---- Files affected:
packages/graphviz:
   graphviz.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: packages/graphviz/graphviz.spec
diff -u packages/graphviz/graphviz.spec:1.99 
packages/graphviz/graphviz.spec:1.100
--- packages/graphviz/graphviz.spec:1.99        Fri Feb 26 23:49:38 2010
+++ packages/graphviz/graphviz.spec     Mon Mar  1 19:28:09 2010
@@ -36,10 +36,11 @@
 Patch7:                gv.i.patch
 Patch8:                swig_php5.patch
 URL:           http://www.graphviz.org/
+BuildRequires: DevIL-devel
+BuildRequires: R
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: DevIL-devel
 BuildRequires: expat-devel >= 1.95
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.0
@@ -274,13 +275,17 @@
 %{__autoheader}
 %{__automake}
 
+CPPFLAGS="%{rpmcppflags}"
+CPPFLAGS="$CPPFLAGS -I%{_includedir}/ruby-1.9 
-I%{_includedir}/ruby-1.9/%{_target}"
+
 %if %{with java}
 JAVA_HOME=%{java_home}
 export JAVA_HOME
-CPPFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-export CPPFLAGS
+CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 %endif
 
+export CPPFLAGS
+
 %configure \
        lua_suffix=51 \
        --disable-ltdl-install \
@@ -516,6 +521,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2010/03/01 18:28:09  sparky
+- added ruby 1.9 include dirs, builds now
+- BR: R (but left unpackaged)
+
 Revision 1.99  2010/02/26 22:49:38  hawk
 - release 8
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.99&r2=1.100&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to