Accepting request 311501 from graphics

1

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

graphviz-plugins.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jun 10 06:55:04 UTC 2015 - mpluskal@suse.com
+
+- Update gnome dependencies
+
+-------------------------------------------------------------------
+Fri Apr 17 00:20:57 UTC 2015 - stefan.bruens@rwth-aachen.de
+
+- Cleanup spec:
+  * remove duplicate language binding files
+  * fix fdupes invocation for doc files
+  * remove statements without effect
+  * silence warning messages on plugin deinstallation
+  * fix %post/%pre Requires
+
 -------------------------------------------------------------------
 Thu Mar 19 12:50:46 UTC 2015 - dvlaeev@suse.com
 

graphviz-plugins.spec

@@ -17,6 +17,8 @@
 
 
 %define mname graphviz
+#name of the plugin config file that dot creates
+%define config_file config6
 
 %ifarch aarch64
 %bcond_with    java
@@ -31,6 +33,7 @@ Name:           graphviz-plugins
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
+BuildRequires:  cairo-devel
 BuildRequires:  flex
 BuildRequires:  freetype2-devel >= 2
 BuildRequires:  gcc-c++
@@ -45,6 +48,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  m4
+BuildRequires:  pango-devel
 %ifnarch aarch64
 %if 0%suse_version > 1220
 BuildRequires:  gtkglext-devel
@@ -61,6 +65,7 @@ BuildRequires:  mono-core
 %if %{with graphviz_ocaml}
 BuildRequires:  ocaml
 %endif
+BuildRequires:  fdupes
 BuildRequires:  perl
 BuildRequires:  php5-devel
 BuildRequires:  python-devel
@@ -82,9 +87,6 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libglade-2.0)
 BuildRequires:  pkgconfig(lua) >= 5.1
 BuildRequires:  pkgconfig(pango)
-%if 0%{?suse_version} > 1020
-BuildRequires:  fdupes
-%endif
 Version:        2.38.0
 Release:        0
 Summary:        Graph Visualization Tools
@@ -101,7 +103,6 @@ Patch103:       graphviz-2.20.2-interpreter_names.patch
 Patch106:       graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
 Patch108:       graphviz-useless_warnings.patch
-Requires(pre):  coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %{!?rb_vendorarchdir: %global rb_vendorarchdir %(/usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]' )}
@@ -116,8 +117,7 @@ of graphs (as in nodes and edges, not as in bar charts).
 %package -n graphviz-gnome
 Summary:        Graphviz plugins that use gtk/GNOME
 Group:          Productivity/Graphics/Visualization/Graph
-Requires(pre):  coreutils
+Requires(post): graphviz = %{version}
-Requires(pre):  graphviz = %{version}
 Requires:       xorg-x11-fonts
 Provides:       graphviz_plugin = %{version}
 
@@ -127,9 +127,7 @@ Graphviz plugins that use gtk/GNOME.
 %package -n graphviz-gd
 Summary:        Graphviz plugin for renderers based on gd
 Group:          Productivity/Graphics/Visualization/Graph
-Requires(pre):  coreutils
+Requires(post): graphviz = %{version}
-Requires(pre):  gd
-Requires(pre):  graphviz = %{version}
 Provides:       graphviz_plugin = %{version}
 
 %description -n graphviz-gd
@@ -307,24 +305,17 @@ make DESTDIR=%{buildroot}  %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} \
-	docdir=%{buildroot}%{_docdir}/%{mname} \
 	pkgconfigdir=%{_libdir}/pkgconfig
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p %{buildroot}/%{_docdir}
 mkdir -p %{buildroot}%{_datadir}/%{mname}
 mkdir -p %{buildroot}%{_datadir}/tcl/%{mname}
-chmod -x %{buildroot}%{_datadir}/%{mname}/lefty/*
+cp -a %{buildroot}%{_datadir}/%{mname}/doc %{buildroot}%{_defaultdocdir}/%{mname}-doc
-cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc
 rm -rf %{buildroot}%{_datadir}/%{mname}/doc
 mkdir -p %{buildroot}%{_libdir}/graphviz
-touch %{buildroot}%{_libdir}/graphviz/config
-#Correct the path to the shared library
-for manfile in $(find %{buildroot} -name \*.man); do
-    sed -e 's$/usr/lib/graphviz$%{_libdir}/%{mname}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
-done
 rm -f  %{buildroot}%{_bindir}/*
 rm -rf %{buildroot}%{_includedir}/graphviz
-rm -f  %{buildroot}%{_libdir}/graphviz/config
+rm -f  %{buildroot}%{_libdir}/graphviz/%{config_file}
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_core*
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_dot_layout*
 rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_neato_layout*
@@ -333,21 +324,22 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
 rm -rf %{buildroot}%{_datadir}/graphviz/graphs
 rm -rf %{buildroot}%{_datadir}/graphviz/lefty
 rm -rf %{buildroot}%{_mandir}/man1
-rm -f  %{buildroot}%{_mandir}/man3/*.3.gz
 rm -f  %{buildroot}%{_mandir}/man3/*.3
 rm -f  %{buildroot}%{_mandir}/man7/*.7
-rm -f  %{buildroot}%{_mandir}/man7/*.7.gz
 rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr
-rm -rf %{buildroot}%{_datadir}/%{mname}/gvedit
 for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* libtkspline*; do
    mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir}
 done
-%if 0%{?suse_version} > 1020
+%fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}-doc
-%fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}
-%endif
 rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 install -Dd %{buildroot}%{rb_vendorarchdir}
 mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/pkgIndex.tcl
+# remove graphviz bindings from graphviz dir, these are installed into the language specific directories
+rm -rf %{buildroot}%{_libdir}/graphviz/lua
+rm -rf %{buildroot}%{_libdir}/graphviz/perl
+rm -rf %{buildroot}%{_libdir}/%{mname}/php
+rm -rf %{buildroot}%{_libdir}/graphviz/python
+rm -rf %{buildroot}%{_libdir}/graphviz/ruby
 
 %files -n graphviz-gd
 %defattr(-,root,root)
@@ -357,13 +349,13 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 %{_bindir}/dot -c
 
 %postun -n graphviz-gd
-%{_bindir}/dot -c
+%{_bindir}/dot -c 2>/dev/null
 
 %post -n graphviz-gnome
 %{_bindir}/dot -c
 
 %postun -n graphviz-gnome
-%{_bindir}/dot -c
+%{_bindir}/dot -c 2>/dev/null
 
 %files -n graphviz-gnome
 %defattr(-,root,root,-)
@@ -398,9 +390,7 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 %files -n graphviz-lua
 %defattr(-,root,root,-)
 %{_datadir}/%{mname}/demo/modgraph.lua
-%dir %{_libdir}/lua
 %dir %lua_libdir
-%{_libdir}/graphviz/lua
 %{lua_libdir}/gv.so
 %doc %{_mandir}/man3/gv.3lua.gz
 
@@ -413,7 +403,6 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 
 %files -n graphviz-perl
 %defattr(-,root,root,-)
-%{_libdir}/graphviz/perl
 %{perl_vendorarch}/gv.pm
 %{perl_vendorarch}/gv.so
 %{_datadir}/%{mname}/demo/modgraph.pl
@@ -424,15 +413,10 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 %{_libdir}/php5/extensions/gv.so
 %{_datadir}/php5/gv.php
 %doc %{_mandir}/man3/gv.3php.gz
-%dir %{_libdir}/%{mname}/php
-%{_libdir}/%{mname}/php/gv.php
-%{_libdir}/%{mname}/php/gv.so
-%{_libdir}/%{mname}/php/libgv_php.so
 %{_datadir}/%{mname}/demo/modgraph.php
 
 %files -n graphviz-python
 %defattr(-,root,root,-)
-%{_libdir}/graphviz/python
 %{py_sitedir}/_gv.so
 %{py_sitedir}/gv.py
 %doc %{_mandir}/man3/gv.3python.gz
@@ -440,7 +424,6 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 
 %files -n graphviz-ruby
 %defattr(-,root,root,-)
-%{_libdir}/graphviz/ruby
 %{rb_vendorarchdir}/gv.so
 %doc %{_mandir}/man3/gv.3ruby.gz
 %{_datadir}/%{mname}/demo/modgraph.rb
@@ -466,7 +449,7 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
 
 %files -n graphviz-doc
 %defattr(-,root,root,-)
-%docdir %{_defaultdocdir}/%{mname}
+%docdir %{_defaultdocdir}/%{mname}-doc
-%doc __doc/*
+%{_defaultdocdir}/%{mname}-doc
 
 %changelog

graphviz.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun 10 06:54:27 UTC 2015 - mpluskal@suse.com
+
+- Remove pangocairo and lasi support as it introduces build cycle
+
+-------------------------------------------------------------------
+Thu Apr  9 07:38:01 UTC 2015 - opensuse.lietuviu.kalba@gmail.com
+
+- Build with pangocairo and lasi support.
+
 -------------------------------------------------------------------
 Mon Nov 17 03:14:00 UTC 2014 - Led <ledest@gmail.com>
 

graphviz.spec

@@ -68,14 +68,20 @@ of graphs (as in nodes and edges, not as in bar charts).
 Summary:        Graphiviz development package
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
+Requires:       cairo-devel
 Requires:       expat
 Requires:       fontconfig-devel
 Requires:       freetype2-devel
 Requires:       glibc-devel
 Requires:       libjpeg-devel
+# Skip SLE 12
+%if ( 0%{?suse_version} == 1310 || 0%{?suse_version} >= 1320 )
+Requires:       libLASi-devel
+%endif
 Requires:       libpng-devel
 Requires:       libstdc++-devel
 Requires:       libtool
+Requires:       pango-devel
 Requires:       perl
 Requires:       tcl-devel
 Requires:       tk-devel
@@ -162,10 +168,9 @@ EOF
 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.*
+# these are in GNOME plugins package
-rm -f %{_libdir}/graphviz/libgvplugin_pango*
+rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_pango*
-rm -f %{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
+rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib*
-rm -f %{_libdir}/graphviz/libgvplugin_gtk*
 
 %post
 /sbin/ldconfig