fix use of version numbers in plugins

fix rpm breakage

diff --git a/configure.ac b/configure.ac
index 1532f33ce6f4d550a5a9c144b9f1026b6e879f22..7b06a98af968d311f22283626d09c520877574a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,12 @@
 # Process this file with autoconf to produce a configure script
 AC_PREREQ(2.54)
 
-dnl ===========================================================================
-
 # Package name and version number, (as distinct from shared library version)
 AC_INIT(graphviz, 2.15)
 
-# libtool shared library version
+dnl ===========================================================================
+
+# libtool shared library version for main libs (cdt, graph, gvc)
 
 # Increment if the interface has additions, changes, removals.
 LT_CURRENT=4
@@ -24,16 +24,28 @@ LT_AGE=0
 
 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
 AC_SUBST(VERSION_INFO)
-
 dnl ===========================================================================
 
-# plugin version
+# libtool shared library version for plugins
 
 # Increment if the interface has additions, changes, removals.
 GVPLUGIN_CURRENT=5
 
+# Increment any time the source changes; set to
+# 0 if you increment CURRENT
+GVPLUGIN_REVISION=0
+
+# Increment if any interfaces have been added; set to 0
+# if any interfaces have been removed. removal has
+# precedence over adding, so set to 0 if both happened.
+GVPLUGIN_AGE=0
+
+GVPLUGIN_VERSION_INFO="$GVPLUGIN_CURRENT:$GVPLUGIN_REVISION:$GVPLUGIN_AGE"
+AC_SUBST(GVPLUGIN_VERSION_INFO)
+
 dnl ===========================================================================
 
+
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 
@@ -1355,10 +1367,12 @@ AC_SUBST(Z_INCLUDES)
 AC_SUBST(Z_LIBS)
 
 dnl -----------------------------------
-dnl DIGCOLA (enabled by default)
+dnl DIGCOLA 
+
 AC_ARG_WITH(digcola,
   [AC_HELP_STRING([--with-digcola],
                   [with DIGCOLA features in neato layout engine])])
+
 if test "x$with_digcola" != "xno"; then
        AC_DEFINE_UNQUOTED(DIGCOLA,1,[Define if you want DIGCOLA])
 else
@@ -1366,19 +1380,17 @@ else
 fi
 
 dnl -----------------------------------
-dnl IPSEPCOLA (disable by default)
+dnl IPSEPCOLA 
 AC_ARG_WITH(ipsepcola,
   [AC_HELP_STRING([--with-ipsepcola],
                   [with IPSEPCOLA features in neato layout engine])])
-if test "x$with_digcola" = "xno"; then
-       with_ipsepcola=no
 
+
+if test "x$with_digcola" != "xno"; then
+       with_ipsepcola=yes
 fi
-if test "x$with_ipsepcola" != "xyes"; then
-       IPSEPCOLA_INCLUDES=
-       IPSEPCOLA_LIBS=
-else
-       AC_MSG_WARN(Optional IPSEPCOLA is enabled)
+
+if test "x$with_ipsepcola" = "xyes"; then
        AC_DEFINE_UNQUOTED(IPSEPCOLA,1,[Define if you want IPSEPCOLA])
        IPSEPCOLA_INCLUDES='-I$(top_srcdir)/lib/vpsc'
        IPSEPCOLA_LIBS='$(top_builddir)/lib/vpsc/libvpsc_C.la -lstdc++'
@@ -1544,25 +1556,25 @@ dnl INCLUDES and LIBS for LIBMING (SWF renderer)
 GV_PATH_MING
 AM_CONDITIONAL(WITH_MING, [ test x"$MAKESWF" != x ])
 
-#AC_ARG_WITH(libming,
-#  [AC_HELP_STRING([--with-libming],
-#                  [use libming library])])
-#
-#### default is to build with libming
-#if test "x$with_libming" != "xno"; then
-#      with_libming=yes
-#fi
-#
-#if test "x$with_libming" = "xyes"; then
-#PKG_CHECK_MODULES(LIBMING, [libming >= 0.4],
-#      [HAVE_LIBMING=1
-#      AC_DEFINE_UNQUOTED(HAVE_LIBMING,1,
-#              [Define if you have the libming library for SWF support])],
-#      [AC_MSG_WARN(libming library not available)])
-#AC_SUBST(LIBMING_CFLAGS)
-#AC_SUBST(LIBMING_LIBS)
-#fi
-#AM_CONDITIONAL(WITH_LIBMING, [test "x$HAVE_LIBMING" != "x"])
+AC_ARG_WITH(libming,
+  [AC_HELP_STRING([--with-libming],
+                  [use libming library])])
+
+### default is to build with libming
+if test "x$with_libming" != "xno"; then
+       with_libming=yes
+fi
+
+if test "x$with_libming" = "xyes"; then
+PKG_CHECK_MODULES(LIBMING, [libming >= 0.4],
+       [HAVE_LIBMING=1
+       AC_DEFINE_UNQUOTED(HAVE_LIBMING,1,
+               [Define if you have the libming library for SWF support])],
+       [AC_MSG_WARN(libming library not available)])
+AC_SUBST(LIBMING_CFLAGS)
+AC_SUBST(LIBMING_LIBS)
+fi
+AM_CONDITIONAL(WITH_LIBMING, [test "x$HAVE_LIBMING" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GD

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 829f1a1798fd3b85557851ffb6ac2e33c195df32..34fc191dbbce29ca856cd4065810875579c47d52 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -39,7 +39,8 @@ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-@VERSION@.tar.gz
 %define MYLIBGD --with-mylibgd
 %define MING --without-ming
 %define PANGOCAIRO --without-pangocairo
-%define DEVIL --without-devil
+%define DEVIL 0
+%define MING 0
 %define GDK_PIXBUF --without-gdk-pixbuf
 
 # SuSE uses a different mechanism to generate BuildRequires
@@ -136,9 +137,9 @@ BuildRequires: mono-core ocaml
 BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
 %endif
 %if "%fedora" >= "7"
+%define DEVIL 1
 %define MYLIBGD --without-mylibgd
 %define GDK_PIXBUF --with-gdk-pixbuf
-%define DEVIL --with-devil
 BuildRequires: gd gd-devel perl-devel DevIL-devel
 %endif
 %endif
@@ -177,7 +178,12 @@ fi
 %{_datadir}/graphviz/lefty
 %exclude %{_libdir}/graphviz/*/*
 %exclude %{_libdir}/graphviz/libgvplugin_gd.*
+%if %{DEVIL}
 %exclude %{_libdir}/graphviz/libgvplugin_devil.*
+%endif
+%if %{MING}
+%exclude %{_libdir}/graphviz/libgvplugin_ming.*
+%endif
 
 #-- graphviz-gd rpm --------------------------------------------------
 %package gd
@@ -206,6 +212,7 @@ based renderer.)
 %{_libdir}/graphviz/libgvplugin_gd.so.*
 
 #-- graphviz-devil rpm --------------------------------------------------
+%if %{DEVIL}
 %package devil
 Group:            Applications/Multimedia
 Summary:          Graphviz plugin for renderers based on DevIL
@@ -229,6 +236,32 @@ support directly by the cairo+pango based renderer in the base graphviz rpm.)
 
 %files devil
 %{_libdir}/graphviz/libgvplugin_devil.so.*
+%endif
+
+#-- graphviz-ming rpm --------------------------------------------------
+%if %{MING}
+%package ming
+Group:            Applications/Multimedia
+Summary:          Graphviz plugin for flash renderer based on ming
+Requires:         graphviz = %{version}-%{release}
+Requires(post):   %{_bindir}/dot /sbin/ldconfig
+Requires(postun): %{_bindir}/dot /sbin/ldconfig
+
+%description ming
+Graphviz plugin for -Tswf (flash) renderer based on ming.
+
+# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+%post ming
+/sbin/ldconfig
+%{_bindir}/dot -c
+
+%postun ming
+/sbin/ldconfig
+[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || :
+
+%files ming
+%{_libdir}/graphviz/libgvplugin_ming.so.*
+%endif
 
 #-- graphviz-sharp rpm --------------------------------------------
 %if %{SHARP}
@@ -507,6 +540,12 @@ Provides some additional PDF and HTML documentation for graphviz.
 %if ! %{TCL}
 %define NO_TCL --disable-tcl
 %endif
+%if ! %{DEVIL}
+%define NO_DEVIL --without-devil
+%endif
+%if ! %{MING}
+%define NO_MING --without-ming
+%endif
 
 # XXX ix86 only used to have -ffast-math, let's use everywhere
 %{expand: %%define optflags %{optflags} -ffast-math}
@@ -523,8 +562,8 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --with-x \
        --disable-static \
         --disable-dependency-tracking \
-       %{MYLIBGD} %{IPSEPCOLA} %{MING} %{PANGOCAIRO} %{DEVIL} %{GDK_PIXBUF} \
-        %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL}
+       %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \
+        %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING}
 make %{?_smp_mflags}
 
 %install

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 0f42e19d3cbe8555f8b519f3db1c84b530daea2a..51d75aba2d6dac99530899330f4a145c415a934d 100644 (file)
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -25,7 +25,7 @@ libgvplugin_core_C_la_SOURCES = \
        gvrender_core_map.c \
        gvloadimage_core.c
 
-libgvplugin_core_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ --no-undefined
 libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
 libgvplugin_core_la_LIBADD = 
 

diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am
index 23a4bfe491d29ed241c542204b9b4ae0d9816f1c..ab6f8e9662c13dcd025d176021dc5ff540ef70de 100644 (file)
--- a/plugin/devil/Makefile.am
+++ b/plugin/devil/Makefile.am
@@ -19,7 +19,7 @@ libgvplugin_devil_C_la_SOURCES = \
        gvplugin_devil.c \
        gvdevice_devil.c
 
-libgvplugin_devil_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_devil_la_SOURCES = $(libgvplugin_devil_C_la_SOURCES)
 libgvplugin_devil_la_LIBADD = @DEVIL_LIBS@
 

diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index d60f162f38cb79217dc4ebf29b76a9b76fa7c19a..f982c5f5ebadb9dbc7f58eb5621bcb6ca27cde44 100644 (file)
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -20,7 +20,7 @@ libgvplugin_dot_layout_C_la_SOURCES = \
 libgvplugin_dot_layout_C_la_LIBADD = \
        $(top_builddir)/lib/dotgen/libdotgen_C.la
 
-libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ --no-undefined
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
 libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
        $(top_builddir)/lib/gvc/libgvc.la \

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index d41ee2d24b5d49b5863ead9e0d096e305a151a29..2f4505541404d5cf8c2b9501de0345f57a399f23 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -22,7 +22,7 @@ libgvplugin_gd_C_la_SOURCES = \
        gvloadimage_gd.c \
        gvdevice_gd.c
 
-libgvplugin_gd_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ --no-undefined
 libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
 if WITH_MYLIBGD
 libgvplugin_gd_la_LIBADD = \

diff --git a/plugin/gdk_pixbuf/Makefile.am b/plugin/gdk_pixbuf/Makefile.am
index 5dd9fd75e08ddca7ea43fd732d99df5fb66b7f3a..e32d2005a0839739cb5ffb5cc205017504f08267 100644 (file)
--- a/plugin/gdk_pixbuf/Makefile.am
+++ b/plugin/gdk_pixbuf/Makefile.am
@@ -19,7 +19,7 @@ libgvplugin_gdk_pixbuf_C_la_SOURCES = \
        gvplugin_gdk_pixbuf.c \
        gvdevice_gdk_pixbuf.c
 
-libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_gdk_pixbuf_la_SOURCES = $(libgvplugin_gdk_pixbuf_C_la_SOURCES)
 libgvplugin_gdk_pixbuf_la_LIBADD = @GDK_PIXBUF_LIBS@
 

diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index f776894c642861f5b3c89acefc3ad59c459b9d9e..89ae178fe16f768a2131b29a979defd31810d67f 100644 (file)
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -25,7 +25,7 @@ libgvplugin_gtk_C_la_SOURCES = \
         interface.c \
         callbacks.c 
 
-libgvplugin_gtk_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
 libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS)
 

diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index 8105ec2c08da8257c853c8437c69328e6520eef2..a6100e100bd7bedc1b5321c98a7e02ac7a775bfe 100644 (file)
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -20,7 +20,7 @@ libgvplugin_ming_C_la_SOURCES = \
        gvplugin_ming.c \
        gvrender_ming.c
 
-libgvplugin_ming_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
 libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
 

diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index e66ce70a856d6e75fbdc0359bcc8af316c734893..70d02570d283b201dbd86e9a05655036df4415ac 100644 (file)
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -23,7 +23,7 @@ libgvplugin_neato_layout_C_la_LIBADD = \
        $(top_builddir)/lib/fdpgen/libfdpgen_C.la \
        $(top_builddir)/lib/circogen/libcircogen_C.la
 
-libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ --no-undefined
 libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
 libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
        $(top_builddir)/lib/gvc/libgvc.la \

diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index bfff02b07f8b72a91df0478f8db9fc21e145be53..0adff269a30ef6da23d1bb23fb7899b52556f015 100644 (file)
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -21,7 +21,7 @@ libgvplugin_pango_C_la_SOURCES = \
        gvtextlayout_pango.c \
        gvloadimage_pango.c
 
-libgvplugin_pango_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
 libgvplugin_pango_la_LIBADD = @PANGOCAIRO_LIBS@ @FONTCONFIG_LIBS@ @MATH_LIBS@
 

diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index e448da14b2051d263ab1c10be069ad4ebbecf31f..01926967931e62d1bd87e931fbc1aaf24f91fba6 100644 (file)
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -21,6 +21,6 @@ libgvplugin_xlib_C_la_SOURCES = \
        gvplugin_xlib.c \
        gvdevice_xlib.c
 
-libgvplugin_xlib_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
 libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES)
 libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ @X_LIBS@ -lX11 @SOCKET_LIBS@ @MATH_LIBS@