Commit a529bfd1 authored by John Ellson's avatar John Ellson

fix -Tvisio from RH patch

parent 4ea146f9
# $Id$ $Revision$
# Process this file with autoconf to produce a configure script
# Try to use version available on FC8
AC_PREREQ(2.61)
......@@ -1876,11 +1874,11 @@ dnl -----------------------------------
dnl INCLUDES and LIBS for VISIO
AC_ARG_WITH(visio,
[AS_HELP_STRING([--with-visio=no],[visio library])],
[], [with_visio=no])
[AS_HELP_STRING([--with-visio=yes],[visio library])],
[], [with_visio=yes])
if test "x$with_visio" != "xyes"; then
use_visio="No (disabled by default - experimental)"
use_visio="No (disabled)"
else
# AC_CHECK_HEADER(visio/visio.h, VISIO_CFLAGS="",use_visio="No (missing headers)")
# if test "x$use_visio" = "x"; then
......
......@@ -29,6 +29,7 @@
#define isfinite(x) finite(x)
#endif
#include <cstdlib>
#include "VisioGraphic.h"
#include "gvcjob.h"
......
......@@ -17,6 +17,7 @@
#include "gvcjob.h"
#include "gvio.h"
#include <cstdlib>
#include <string.h>
extern "C" char *xml_string(char* str);
......
# $Id$ $Revision$
# @configure_input@
#-- Global graphviz rpm and src.rpm tags-------------------------------------
......@@ -11,23 +10,74 @@ License: EPL
URL: http://www.graphviz.org/
Source0: http://www.graphviz.org/pub/@GRAPHVIZ_SOURCES@/graphviz-@VERSION@.tar.gz
# Necessary conditionals
%ifarch %{mono_arches}
%global SHARP 1
%else
%global SHARP 0
%endif
%global OCAML 1
%global ARRRR 1
%global DEVIL 1
%global GTS 1
%global LASI 1
# Not in Fedora yet.
%global MING 0
# Not in RHEL yet.
%if 0%{?rhel}
%global SHARP 0
%global ARRRR 0
%global DEVIL 0
%global GTS 0
%global LASI 0
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel expat-devel ann-devel ksh bison m4 flex swig gcc-c++
BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel
BuildRequires: libXmu-devel libXext-devel libX11-devel qt-devel gtk2-devel freeglut-devel
BuildRequires: libglade2-devel gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel
BuildRequires: freetype-devel fontconfig-devel cairo-devel pango-devel mono-core ocaml
BuildRequires: gmp-devel gts-devel lasi-devel gd gd-devel librsvg2-devel DevIL-devel
BuildRequires: freetype-devel fontconfig-devel cairo-devel pango-devel
BuildRequires: gmp-devel gd gd-devel librsvg2-devel
BuildRequires: ghostscript-devel poppler-glib-devel libtool-ltdl libtool-ltdl-devel
BuildRequires: ruby ruby-devel guile-devel java-devel php-devel lua-devel R-devel
BuildRequires: ruby ruby-devel guile-devel java-devel php-devel lua-devel
BuildRequires: perl-devel perl-libs perl-ExtUtils-Embed tcl tcl-devel tk tk-devel
BuildRequires: libwebp-devel golang gcc-go python2 python2-devel python3 python3-devel
%if %{SHARP}
BuildRequires: mono-core
%endif
%if %{DEVIL}
BuildRequires: DevIL-devel
%endif
%if %{ARRRR}
BuildRequires: R-devel
%endif
%if %{OCAML}
BuildRequires: ocaml
%endif
%if %{GTS}
BuildRequires: gts-devel
%endif
%if %{LASI}
BuildRequires: lasi-devel
%endif
# What a meal PHP makes of versioning !!!
%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%if "%{php_version}" < "5.6"
%global ini_name %{name}.ini
%else
%global ini_name 40-%{name}.ini
%endif
# Fix private-shared-object-provides
# RPM 4.8
%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$}
......@@ -35,6 +85,10 @@ BuildRequires: libwebp-devel golang gcc-go python2 python2-devel python3 python3
# RPM 4.9
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
# Fix for the 387 extended precision (rhbz#772637)
%ifarch i386 i686
%global FFSTORE -ffloat-store
%endif
#-- main graphviz rpm ------------------------------------------------
Requires: %{name}-nox = %{version}-%{release}
......@@ -321,6 +375,27 @@ LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
%dir %{_libdir}/graphviz
%{_libdir}/graphviz/libgvplugin_webp.so.*
#-- graphviz-plugins-visio rpm --------------------------------------------------
%package plugins-visio
Group: Applications/Multimedia
Summary: Graphviz plugin for visio format images
Requires: %{name}-nox = %{version}-%{release}
%description plugins-visio
Graphviz plugin for visio image rendering.
# run "dot -c" to generate plugin config in {_libdir}/graphviz/config6
%post plugins-visio
LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
%postun plugins-visio
[ -x $RPM_INSTALL_PREFIX0/bin/dot ] && LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c || :
%files plugins-visio
%defattr(-,root,root,-)
%dir %{_libdir}/graphviz
%{_libdir}/graphviz/libgvplugin_visio.so.*
#-- graphviz-plugins-devil rpm --------------------------------------------------
%package plugins-devil
Group: Applications/Multimedia
......@@ -347,7 +422,7 @@ LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c
%{_libdir}/graphviz/libgvplugin_devil.so.*
#-- graphviz-plugins-ming rpm --------------------------------------------------
%if 0%{?MING}
%if %{MING}
%package plugins-ming
Group: Applications/Multimedia
Summary: Graphviz plugin for flash renderer based on ming
......@@ -386,6 +461,7 @@ Graphviz applications using _QT - currently just gvedit
%{_mandir}/man1/gvedit.1*
#-- graphviz-lang-sharp rpm --------------------------------------------
%if %{SHARP}
%package lang-sharp
Group: Applications/Multimedia
Summary: C# extension for graphviz
......@@ -401,6 +477,7 @@ C# extension for graphviz.
%dir %{_libdir}/graphviz/sharp
%{_libdir}/graphviz/sharp/*
%{_mandir}/man3/*.3sharp.*
%endif
#-- graphviz-lang-go rpm --------------------------------------------
%package lang-go
......@@ -489,6 +566,7 @@ Lua extension for graphviz.
%exclude %{_libdir}/graphviz/lua/*.so
#-- graphviz-lang-ocaml rpm --------------------------------------------
%if %{OCAML}
%package lang-ocaml
Group: Applications/Multimedia
Summary: Ocaml extension for graphviz
......@@ -504,6 +582,7 @@ Ocaml extension for graphviz.
%dir %{_libdir}/graphviz/ocaml
%{_libdir}/graphviz/ocaml/*
%{_mandir}/man3/*.3ocaml.*
%endif
#-- graphviz-lang-perl rpm ---------------------------------------------
%package lang-perl
......@@ -584,6 +663,7 @@ Python extension for graphviz.
%exclude %{_libdir}/graphviz/python3/*.py*
#-- graphviz-lang-R rpm ---------------------------------------------
%if %{ARRRR}
%package lang-R
Group: Applications/Multimedia
Summary: R extension for graphviz
......@@ -599,6 +679,7 @@ R extension for graphviz.
%dir %{_libdir}/graphviz/R
%{_libdir}/graphviz/R/*
%{_mandir}/man3/*.3r.*
%endif
#-- graphviz-lang-ruby rpm ---------------------------------------------
%package lang-ruby
......@@ -739,24 +820,41 @@ CFLAGS="$RPM_OPT_FLAGS" \
--disable-io \
--enable-java \
--enable-lua \
--enable-ocaml \
--enable-perl \
--enable-php \
--disable-python \
--enable-python2 \
--enable-python3 \
--enable-r \
--enable-ruby \
--enable-tcl \
--with-devil \
--with-webp \
--with-gdk \
--with-ghostscript \
--without-glitz \
--with-ipsepcola \
--with-lasi \
%if ! %{LASI}
--without-lasi \
%endif
%if ! %{GTS}
--without-gts \
%endif
%if ! %{SHARP}
--disable-sharp \
%endif
%if ! %{OCAML}
--disable-ocaml \
%endif
%if ! %{MING}
--without-ming \
%endif
%if ! %{ARRRR}
--disable-r \
%endif
%if ! %{DEVIL}
--without-devil \
%endif
--with-qt \
--with-visio \
--with-pangocairo \
--with-poppler \
--with-rsvg \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment