Accepting request 297862 from home:StefanBruens:branches:graphics

OBS-URL: https://build.opensuse.org/request/show/297862
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=101
This commit is contained in:
OBS User mrdocs 2015-04-19 19:36:04 +00:00 committed by Git OBS Bridge
parent 9834e9b9d3
commit 3ffc38f2d1
2 changed files with 28 additions and 37 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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

View File

@ -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
@ -61,6 +63,7 @@ BuildRequires: mono-core
%if %{with graphviz_ocaml}
BuildRequires: ocaml
%endif
BuildRequires: fdupes
BuildRequires: perl
BuildRequires: php5-devel
BuildRequires: python-devel
@ -82,9 +85,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 +101,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 +115,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(pre): graphviz = %{version}
Requires(post): graphviz = %{version}
Requires: xorg-x11-fonts
Provides: graphviz_plugin = %{version}
@ -127,9 +125,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(pre): gd
Requires(pre): graphviz = %{version}
Requires(post): graphviz = %{version}
Provides: graphviz_plugin = %{version}
%description -n graphviz-gd
@ -307,24 +303,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 __doc
cp -a %{buildroot}%{_datadir}/%{mname}/doc %{buildroot}%{_defaultdocdir}/%{mname}-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 +322,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}
%endif
%fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}-doc
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 +347,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 +388,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 +401,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 +411,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 +422,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 +447,7 @@ mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/
%files -n graphviz-doc
%defattr(-,root,root,-)
%docdir %{_defaultdocdir}/%{mname}
%doc __doc/*
%docdir %{_defaultdocdir}/%{mname}-doc
%{_defaultdocdir}/%{mname}-doc
%changelog