Accepting request 214364 from home:coolo:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/214364
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=77

graphviz-plugins.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Jan 18 17:06:59 UTC 2014 - coolo@suse.com
+
+- fix mono bcond. It's without, not !with
+
+-------------------------------------------------------------------
+Sat Jan 18 16:47:55 UTC 2014 - coolo@suse.com
+
+- use global java bcond instead of an own now that it buildrequires
+  jdk and no longer gcc
+
 -------------------------------------------------------------------
 Tue Jan 14 11:54:17 UTC 2014 - dvlaeev@suse.com
 

graphviz-plugins.spec

@@ -19,10 +19,10 @@
 %define mname graphviz
 
 %ifarch aarch64
-%bcond_with    graphviz_java
+%bcond_with    java
 %bcond_with    graphviz_ocaml
 %else
-%bcond_without graphviz_java
+%bcond_without java
 %bcond_without graphviz_ocaml
 %endif
 %bcond_without mono
@@ -50,7 +50,7 @@ BuildRequires:  m4
 BuildRequires:  gtkglext-devel
 %endif
 %endif
-%if %{with graphviz_java}
+%if %{with java}
 #BuildRequires:  gcc-java
 #BuildRequires:  libgcj-devel
 BuildRequires:  java-devel >= 1.6.0
@@ -151,7 +151,7 @@ Provides:       graphviz_plugin = %{version}
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
-%if %{with graphviz_java}
+%if %{with java}
 %package -n graphviz-java
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -304,7 +304,7 @@ export CPPFLAGS="%{optflags}"
       --without-ming \
       --disable-silent-rules \
       --enable-ltdl-install=no \
-%if %{!with mono}
+%if %{without mono}
       --enable-sharp=no \
 %endif
       --disable-io
@@ -384,7 +384,7 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 %{_libdir}/graphviz/guile
 %doc %{_mandir}/man3/gv.3guile.gz
 
-%if %{with graphviz_java}
+%if %{with java}
 %files -n graphviz-java
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/java