OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=20

graphviz-plugins.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 22 14:37:18 CEST 2008 - pth@suse.de
+
+- Move all GTK/GNOME related stuff to plugins package.
+
 -------------------------------------------------------------------
 Thu Apr 17 13:08:40 CEST 2008 - pth@suse.de
 

graphviz-plugins.spec

@@ -13,18 +13,18 @@
 %define mname graphviz
 
 Name:           graphviz-plugins
-BuildRequires:  libexpat-devel libjpeg-devel libpng-devel swig zlib-devel
+BuildRequires:  gd-devel libexpat-devel libjpeg-devel libpng-devel swig zlib-devel
 BuildRequires:  freetype2-devel >= 2 gcc-c++ ksh libstdc++-devel
-BuildRequires:  bison flex glib2-devel m4 perl python-devel swig tk-devel >= 8.3 xorg-x11-devel
+BuildRequires:  bison flex glib2-devel m4 perl python-devel tk-devel >= 8.3 xorg-x11-devel
 BuildRequires:  php5-devel ruby-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
 BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
 BuildRequires:  cairo-devel gcc-java gmp-devel guile-devel libgcj-devel lua-devel mono-core ocaml pango-devel
-BuildRequires:  graphviz libgnomeui-devel
+BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
 Version:        2.18
-Release:        5
+Release:        6
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -62,6 +62,28 @@ of graphs (as in nodes and edges, not as in bar charts).
 
 
 
+Authors:
+--------
+    David Dobkin <dpd@cs.princeton.edu>
+    John Ellson  <ellson@graphviz.org>
+    Emden Gansner <erg@research.att.com>
+    Eleftherios Koutsofios <ek@research.att.com>
+    Stephen North <north@research.att.com>
+    Kiem-Phong Vo <kpv@research.att.com>
+    Gordon Woodhull <gmcw@worldnet.att.net>
+
+%package -n graphviz-gnome
+License:        IBM Public License
+Group:          Productivity/Graphics/Visualization/Graph
+Summary:        Graphviz plugins that use gtk/GNOME
+Requires:       graphviz = %{version}-%{release}
+PreReq:         /bin/rm
+
+%description -n graphviz-gnome
+Graphviz plugins that use gtk/GNOME.
+
+
+
 Authors:
 --------
     David Dobkin <dpd@cs.princeton.edu>
@@ -379,7 +401,6 @@ export CPPFLAGS="%optflags"
       --datadir=%{_datadir} \
       --mandir=%{_mandir} \
       --with-x \
-      --with-mylibgd \
       --disable-static \
       --disable-dependency-tracking \
       --with-ipsepcola \
@@ -410,11 +431,7 @@ rm -rf %{buildroot}/usr/include/graphviz
 rm -f  %{buildroot}%{_libdir}/graphviz/config
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_core*
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_dot_layout*
-rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_gtk*
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_neato_layout*
-rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_pango*
-rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib*
-rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
 rm -f  %{buildroot}%{_libdir}/lib*
 rm -rf %{buildroot}%{_libdir}/pkgconfig
 rm -rf %{buildroot}%{_datadir}/graphviz/graphs
@@ -439,8 +456,18 @@ done
 
 %post -n graphviz-gd -p "%{_bindir}/dot -c"
 
-%postun -n graphviz-gd
+%postun -n graphviz-gd -p "%{_bindir}/dot -c"
-%{_bindir}/dot -c
+
+%post -n graphviz-gnome -p "%{_bindir}/dot -c"
+
+%postun -n graphviz-gnome -p "%{_bindir}/dot -c"
+
+%files -n graphviz-gnome
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/libgvplugin_pango*
+%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
+%{_libdir}/graphviz/libgvplugin_gtk*
+%{_libdir}/graphviz/libgvplugin_xlib*
 
 %post -n graphviz-tcl -p /sbin/ldconfig
 
@@ -537,6 +564,8 @@ done
 %doc __doc/*
 
 %changelog
+* Tue Apr 22 2008 pth@suse.de
+- Move all GTK/GNOME related stuff to plugins package.
 * Thu Apr 17 2008 pth@suse.de
 - Switch off strict aliasing until swig produces code that plays
   by the rules.

graphviz.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 22 14:37:18 CEST 2008 - pth@suse.de
+
+- Move all GTK/GNOME related stuff to plugins package.
+
 -------------------------------------------------------------------
 Tue Apr 15 16:02:22 CEST 2008 - pth@suse.de
 

graphviz.spec

@@ -16,10 +16,9 @@ BuildRequires:  freetype2-devel >= 2 gcc-c++ ksh libstdc++-devel
 BuildRequires:  bison flex glib2-devel xorg-x11-devel
 BuildRequires:  xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
 BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
-BuildRequires:  cairo-devel libgnomeui-devel pango-devel
 PreReq:         /bin/rm
 Version:        2.18
-Release:        10
+Release:        11
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -43,7 +42,8 @@ License:        IBM Public License
 Prefix:         /usr
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /bin/cat
-Recommends:     graphviz-gd
+Recommends:     graphviz-gnome = %{version}
+Recommends:     graphviz-gd = %{version}
 
 %description
 A collection of tools and tcl packages for the manipulation and layout
@@ -168,6 +168,9 @@ for manfile in $(find %{buildroot} -name \*.man); do
     sed -e 's$/usr/lib/graphviz$%{_libdir}/%{name}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
 done
 rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_gd.*
+rm -f %{_libdir}/graphviz/libgvplugin_pango*
+rm -f %{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
+rm -f %{_libdir}/graphviz/libgvplugin_gtk*
 #%clean
 #rm -rf %buildroot
 
@@ -195,13 +198,13 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_libdir}/graphviz/*.so.*
 %{_libdir}/graphviz/libgvplugin_core*
 %{_libdir}/graphviz/libgvplugin_dot_layout*
-%{_libdir}/graphviz/libgvplugin_gtk*
 %{_libdir}/graphviz/libgvplugin_neato_layout*
-%{_libdir}/graphviz/libgvplugin_pango*
+#%{_libdir}/graphviz/libgvplugin_xlib*
-%{_libdir}/graphviz/libgvplugin_xlib*
-%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
 /etc/ld.so.conf.d/graphviz.conf
 %ghost %{_libdir}/graphviz/config
+#%exclude %{_libdir}/graphviz/libgvplugin_pango*
+#%exclude %{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
+#%exclude %{_libdir}/graphviz/libgvplugin_gtk*
 
 %files devel
 %defattr(-,root,root)
@@ -211,6 +214,8 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_mandir}/man3/*.3.gz
 
 %changelog
+* Tue Apr 22 2008 pth@suse.de
+- Move all GTK/GNOME related stuff to plugins package.
 * Tue Apr 15 2008 pth@suse.de
 - Readd plugins left out by accident.
 - Add upstream patch that makes 'dot -c' completely verifiy all