mirror of
https://abf.rosa.ru/djam/graphviz.git
synced 2025-02-23 15:52:55 +00:00
LOG Sync with Cooker (spec cleanup, drop .la files etc), fix unversioned Obsoletes
This commit is contained in:
parent
c7e36722ba
commit
055feeeab4
4 changed files with 193 additions and 74 deletions
48
graphviz-2.28.0-linkage.patch
Normal file
48
graphviz-2.28.0-linkage.patch
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
--- plugin/gtk/Makefile.am.link 2011-09-22 13:53:15.396340012 +0800
|
||||||
|
+++ plugin/gtk/Makefile.am 2011-09-22 13:53:36.088210688 +0800
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
|
||||||
|
libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
|
||||||
|
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
|
||||||
|
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
|
||||||
|
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11
|
||||||
|
|
||||||
|
if WITH_WIN32
|
||||||
|
libgvplugin_gtk_la_LDFLAGS += -no-undefined
|
||||||
|
--- plugin/gtk/Makefile.in.link 2011-09-22 13:53:22.628204613 +0800
|
||||||
|
+++ plugin/gtk/Makefile.in 2011-09-22 13:54:21.718204654 +0800
|
||||||
|
@@ -510,7 +510,7 @@
|
||||||
|
libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ \
|
||||||
|
$(am__append_1) $(am__append_2)
|
||||||
|
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
|
||||||
|
-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS)
|
||||||
|
+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11
|
||||||
|
EXTRA_DIST = gtk.glade gtk.gladep
|
||||||
|
all: all-am
|
||||||
|
|
||||||
|
--- cmd/dot/Makefile.am.link 2011-12-05 01:55:09.196840925 +0800
|
||||||
|
+++ cmd/dot/Makefile.am 2011-12-05 01:55:38.046841679 +0800
|
||||||
|
@@ -116,8 +116,8 @@
|
||||||
|
endif
|
||||||
|
|
||||||
|
if WITH_PANGOCAIRO
|
||||||
|
-dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
|
||||||
|
-dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
|
||||||
|
+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
|
||||||
|
+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj
|
||||||
|
--- cmd/dot/Makefile.in.link 2011-05-07 11:27:39.000000000 +0800
|
||||||
|
+++ cmd/dot/Makefile.in 2011-12-05 02:07:36.536493154 +0800
|
||||||
|
@@ -53,8 +53,8 @@
|
||||||
|
@WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@am__append_5 = $(top_builddir)/plugin/gd/libgvplugin_gd.la $(top_builddir)/lib/gd/libgvgd_C.la $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
|
||||||
|
@WITH_LIBGD_TRUE@@WITH_MYLIBGD_FALSE@am__append_6 = $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
|
||||||
|
@WITH_LIBGD_TRUE@@WITH_MYLIBGD_FALSE@am__append_7 = $(top_builddir)/plugin/gd/libgvplugin_gd.la $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
|
||||||
|
-@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
|
||||||
|
-@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
|
||||||
|
+@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
|
||||||
|
+@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
|
||||||
|
subdir = cmd/dot
|
||||||
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
22
graphviz-2.28.0-new-automake-fix.patch
Normal file
22
graphviz-2.28.0-new-automake-fix.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
--- graphviz-2.28.0/plugin/ming/Makefile.am~ 2009-06-03 03:10:57.000000000 +0200
|
||||||
|
+++ graphviz-2.28.0/plugin/ming/Makefile.am 2012-02-16 06:46:22.942762556 +0100
|
||||||
|
@@ -17,7 +17,7 @@ lib_LTLIBRARIES = libgvplugin_ming.la
|
||||||
|
else
|
||||||
|
pkglib_LTLIBRARIES = libgvplugin_ming.la
|
||||||
|
endif
|
||||||
|
-pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
|
||||||
|
+pkgdata_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
|
||||||
|
endif
|
||||||
|
|
||||||
|
libgvplugin_ming_C_la_SOURCES = \
|
||||||
|
--- graphviz-2.28.0/tclpkg/gv/Makefile.am~ 2011-03-28 20:15:56.000000000 +0200
|
||||||
|
+++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2012-02-16 06:46:03.902743183 +0100
|
||||||
|
@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp
|
||||||
|
gv_tcl.cpp: gv.i
|
||||||
|
$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
|
||||||
|
|
||||||
|
-pkginclude_DATA = gv.i gv.cpp
|
||||||
|
+pkgdata_DATA = gv.i gv.cpp
|
||||||
|
pkglib_LTLIBRARIES =
|
||||||
|
man_MANS =
|
||||||
|
pdf_DATA =
|
36
graphviz-2.28.0-ruby1.9.patch
Normal file
36
graphviz-2.28.0-ruby1.9.patch
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
--- graphviz-2.28.0/config/config_ruby.rb.ruby19~ 2011-02-18 22:25:56.000000000 +0100
|
||||||
|
+++ graphviz-2.28.0/config/config_ruby.rb 2012-02-16 02:59:05.410021805 +0100
|
||||||
|
@@ -5,12 +5,12 @@ CONFIG = Config::MAKEFILE_CONFIG
|
||||||
|
|
||||||
|
case ARGV[0]
|
||||||
|
when "INCLUDES"
|
||||||
|
- puts Config::expand(CONFIG["archdir"])
|
||||||
|
+ puts Config::expand(RbConfig::CONFIG["archdir"])
|
||||||
|
when "lib"
|
||||||
|
- puts Config::expand(CONFIG["libdir"])
|
||||||
|
+ puts Config::expand(RbConfig::CONFIG["libdir"])
|
||||||
|
when "archsitelib"
|
||||||
|
- puts Config::expand(CONFIG["sitearchdir"])
|
||||||
|
+ puts Config::expand(RbConfig::CONFIG["vendorarchdir"])
|
||||||
|
when "sitelib"
|
||||||
|
- puts Config::expand(CONFIG["sitedir"])
|
||||||
|
+ puts Config::expand(RbConfig::CONFIG["sitedir"])
|
||||||
|
end
|
||||||
|
|
||||||
|
--- graphviz-2.28.0/configure.ac.ruby19~ 2012-02-16 03:00:56.579170774 +0100
|
||||||
|
+++ graphviz-2.28.0/configure.ac 2012-02-16 03:00:59.489174708 +0100
|
||||||
|
@@ -1510,12 +1510,12 @@ else
|
||||||
|
if test "x$RUBY" = "x"; then
|
||||||
|
use_ruby="No (ruby not available)"
|
||||||
|
else
|
||||||
|
- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
|
||||||
|
+ RUBY_INCLUDES="$(pkg-config --cflags ruby-1.9)"
|
||||||
|
# hack for powerpc-darwin8 (10.4)
|
||||||
|
if test "x$DARWIN" = "xyes"; then
|
||||||
|
RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
|
||||||
|
fi
|
||||||
|
- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
|
||||||
|
+ RUBY_LIBS="$(pkg-config --libs ruby-1.9)"
|
||||||
|
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
|
||||||
|
save_CPPFLAGS=$CPPFLAGS
|
||||||
|
CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
|
161
graphviz.spec
161
graphviz.spec
|
@ -1,3 +1,7 @@
|
||||||
|
# disable anal madness
|
||||||
|
%define _unpackaged_subdirs_terminate_build 0
|
||||||
|
|
||||||
|
%define _disable_ld_no_undefined 1
|
||||||
%bcond_without static
|
%bcond_without static
|
||||||
%bcond_with libr
|
%bcond_with libr
|
||||||
|
|
||||||
|
@ -22,44 +26,49 @@
|
||||||
Summary: Graph visualization tools
|
Summary: Graph visualization tools
|
||||||
Name: graphviz
|
Name: graphviz
|
||||||
Version: 2.28.0
|
Version: 2.28.0
|
||||||
Release: %mkrel 2
|
Release: 5
|
||||||
Group: Graphics
|
Group: Graphics
|
||||||
License: Common Public License
|
License: Common Public License
|
||||||
URL: http://www.graphviz.org
|
URL: http://www.graphviz.org
|
||||||
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: graphviz-2.28.0-linkage.patch
|
||||||
Patch4: graphviz-2.28.0-fix-format-errors.patch
|
Patch4: graphviz-2.28.0-fix-format-errors.patch
|
||||||
|
Patch5: graphviz-2.28.0-ruby1.9.patch
|
||||||
|
Patch6: graphviz-2.28.0-new-automake-fix.patch
|
||||||
BuildRequires: bison >= 2.3
|
BuildRequires: bison >= 2.3
|
||||||
BuildRequires: flex >= 2.5.4a
|
BuildRequires: flex >= 2.5.4a
|
||||||
|
BuildRequires: libtool
|
||||||
BuildRequires: swig >= 1.3.29
|
BuildRequires: swig >= 1.3.29
|
||||||
BuildRequires: freetype2-devel >= 2.1.10
|
BuildRequires: expat-devel
|
||||||
BuildRequires: pango-devel >= 1.12.4
|
|
||||||
BuildRequires: gd-devel >= 2.0.34
|
BuildRequires: gd-devel >= 2.0.34
|
||||||
BuildRequires: gettext-devel >= 0.14.5
|
BuildRequires: gettext-devel >= 0.14.5
|
||||||
BuildRequires: libcurl-devel
|
# jpeg: No (only required by internal libgd)
|
||||||
BuildRequires: libjpeg-devel
|
#BuildRequires: jpeg-devel
|
||||||
BuildRequires: libtool
|
|
||||||
BuildRequires: libltdl-devel
|
BuildRequires: libltdl-devel
|
||||||
BuildRequires: libpng-devel >= 1.2.10
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: librsvg-devel
|
BuildRequires: pkgconfig(freetype2)
|
||||||
BuildRequires: libx11-devel
|
BuildRequires: pkgconfig(glut)
|
||||||
BuildRequires: libxaw-devel
|
BuildRequires: pkgconfig(gtk+-2.0)
|
||||||
BuildRequires: libxmu-devel
|
BuildRequires: pkgconfig(gtkglext-1.0)
|
||||||
BuildRequires: libxt-devel
|
BuildRequires: pkgconfig(gtkgl-2.0)
|
||||||
BuildRequires: gtk+2-devel
|
BuildRequires: pkgconfig(libcurl)
|
||||||
BuildRequires: gtkglarea2-devel
|
BuildRequires: pkgconfig(libpng)
|
||||||
BuildRequires: gtkglext-devel
|
BuildRequires: pkgconfig(librsvg-2.0)
|
||||||
BuildRequires: zlib-devel >= 1.2.3
|
BuildRequires: pkgconfig(pango)
|
||||||
BuildRequires: libexpat-devel >= 2.0.0
|
BuildRequires: pkgconfig(pangocairo)
|
||||||
BuildRequires: libfontconfig-devel >= 2.3.95
|
BuildRequires: pkgconfig(x11)
|
||||||
|
BuildRequires: pkgconfig(xaw7)
|
||||||
|
BuildRequires: pkgconfig(xmu)
|
||||||
|
BuildRequires: pkgconfig(xt)
|
||||||
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
|
||||||
Conflicts: %{mklibname graphviz 4} < 2.20.3-3
|
Conflicts: %{mklibname graphviz 4} < 2.20.3-3
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A collection of tools for the manipulation and layout
|
A collection of tools for the manipulation and layout
|
||||||
of graphs (as in nodes and edges, not as in barcharts).
|
of graphs (as in nodes and edges, not as in barcharts).
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir %{_libdir}/%{name}
|
%dir %{_libdir}/%{name}
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%_mandir/man?/*
|
%_mandir/man?/*
|
||||||
|
@ -76,7 +85,6 @@ Summary: %{name} documentation
|
||||||
The %{name} documentation.
|
The %{name} documentation.
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_datadir}/doc/%{name}
|
%{_datadir}/doc/%{name}
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -90,7 +98,6 @@ Conflicts: %{_lib}graphviz4 < 2.26
|
||||||
This package provides the cdt shared library for %{name}.
|
This package provides the cdt shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_cdt}
|
%files -n %{lib_cdt}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libcdt.so.%{cdt_major}*
|
%{_libdir}/libcdt.so.%{cdt_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -104,7 +111,6 @@ Conflicts: %{_lib}graphviz4 < 2.26
|
||||||
This package provides the cgraph shared library for %{name}.
|
This package provides the cgraph shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_cgraph}
|
%files -n %{lib_cgraph}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libcgraph.so.%{cgraph_major}*
|
%{_libdir}/libcgraph.so.%{cgraph_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -133,7 +139,6 @@ Conflicts: %{_lib}graphviz4 < 2.26
|
||||||
This package provides the gvc shared library for %{name}.
|
This package provides the gvc shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_gvc}
|
%files -n %{lib_gvc}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libgvc.so.%{gvc_major}*
|
%{_libdir}/libgvc.so.%{gvc_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -146,7 +151,6 @@ Summary: Shared library for %{name}
|
||||||
This package provides the gvpr shared library for %{name}.
|
This package provides the gvpr shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_gvpr}
|
%files -n %{lib_gvpr}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libgvpr.so.%{gvpr_major}*
|
%{_libdir}/libgvpr.so.%{gvpr_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -160,7 +164,6 @@ Conflicts: %{_lib}graphviz4 < 2.26
|
||||||
This package provides the pathplan shared library for %{name}.
|
This package provides the pathplan shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_pathplan}
|
%files -n %{lib_pathplan}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libpathplan.so.%{pathplan_major}*
|
%{_libdir}/libpathplan.so.%{pathplan_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -173,7 +176,6 @@ Summary: Shared library for %{name}
|
||||||
This package provides the xdot shared library for %{name}.
|
This package provides the xdot shared library for %{name}.
|
||||||
|
|
||||||
%files -n %{lib_xdot}
|
%files -n %{lib_xdot}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/libxdot.so.%{xdot_major}*
|
%{_libdir}/libxdot.so.%{xdot_major}*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -190,7 +192,6 @@ Obsoletes: %{mklibname graphvizlua 0}
|
||||||
This package provides the Lua extension for %{name}.
|
This package provides the Lua extension for %{name}.
|
||||||
|
|
||||||
%files -n lua-graphviz
|
%files -n lua-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/lua
|
%{_libdir}/graphviz/lua
|
||||||
%{_libdir}/lua/%{lua_version}/gv.so
|
%{_libdir}/lua/%{lua_version}/gv.so
|
||||||
|
|
||||||
|
@ -199,15 +200,14 @@ This package provides the Lua extension for %{name}.
|
||||||
%package -n php-graphviz
|
%package -n php-graphviz
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for php
|
Summary: Graphviz bindings for php
|
||||||
BuildRequires: php-devel
|
BuildRequires: php-devel
|
||||||
BuildRequires: php-cli
|
BuildRequires: php-cli
|
||||||
Obsoletes: %{mklibname graphvizphp 0}
|
Obsoletes: %{mklibname graphvizphp 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n php-graphviz
|
%description -n php-graphviz
|
||||||
This package provides the PHP extension for %{name}.
|
This package provides the PHP extension for %{name}.
|
||||||
|
|
||||||
%files -n php-graphviz
|
%files -n php-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/php
|
%{_libdir}/graphviz/php
|
||||||
%{_libdir}/php/modules/gv.so
|
%{_libdir}/php/modules/gv.so
|
||||||
%{_datadir}/php/gv.php
|
%{_datadir}/php/gv.php
|
||||||
|
@ -215,32 +215,30 @@ This package provides the PHP extension for %{name}.
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
%package -n python-graphviz
|
%package -n python-graphviz
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for python
|
Summary: Graphviz bindings for python
|
||||||
Obsoletes: %{mklibname graphvizpython 0}
|
Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4
|
||||||
%py_requires -d
|
%py_requires -d
|
||||||
|
|
||||||
%description -n python-graphviz
|
%description -n python-graphviz
|
||||||
This package provides the Python extension for %{name}.
|
This package provides the Python extension for %{name}.
|
||||||
|
|
||||||
%files -n python-graphviz
|
%files -n python-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/python
|
%{_libdir}/graphviz/python
|
||||||
%py_platsitedir/*
|
%py_platsitedir/*
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
%package -n ruby-graphviz
|
%package -n ruby-graphviz
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for ruby
|
Summary: Graphviz bindings for ruby
|
||||||
BuildRequires: ruby-devel
|
BuildRequires: ruby-devel
|
||||||
Obsoletes: %{mklibname graphvizruby 0}
|
Obsoletes: %{mklibname graphvizruby 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n ruby-graphviz
|
%description -n ruby-graphviz
|
||||||
This package provides the Ruby extension for %{name}.
|
This package provides the Ruby extension for %{name}.
|
||||||
|
|
||||||
%files -n ruby-graphviz
|
%files -n ruby-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/ruby
|
%{_libdir}/graphviz/ruby
|
||||||
%{_prefix}/lib/ruby
|
%{_prefix}/lib/ruby
|
||||||
|
|
||||||
|
@ -250,32 +248,30 @@ This package provides the Ruby extension for %{name}.
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for perl
|
Summary: Graphviz bindings for perl
|
||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
Obsoletes: %{mklibname graphvizperl 0}
|
Obsoletes: %{mklibname graphvizperl 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n perl-graphviz
|
%description -n perl-graphviz
|
||||||
This package provides the Perl extension for %{name}.
|
This package provides the Perl extension for %{name}.
|
||||||
|
|
||||||
%files -n perl-graphviz
|
%files -n perl-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{perl_vendorarch}/*
|
%{perl_vendorarch}/*
|
||||||
%{_libdir}/graphviz/perl
|
%{_libdir}/graphviz/perl
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
%package -n tcl-graphviz
|
%package -n tcl-graphviz
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for tcl
|
Summary: Graphviz bindings for tcl
|
||||||
BuildRequires: tcl-devel >= 8.3.0
|
BuildRequires: tcl-devel >= 8.3.0
|
||||||
BuildRequires: tk-devel >= 8.3.0
|
BuildRequires: tk-devel >= 8.3.0
|
||||||
BuildRequires: tk >= 8.3.0
|
BuildRequires: tk >= 8.3.0
|
||||||
Obsoletes: %{mklibname graphviztcl 7 -d}
|
Obsoletes: %{mklibname graphviztcl 7 -d} < 2.28.0-4
|
||||||
Obsoletes: %{mklibname graphviztcl 0}
|
Obsoletes: %{mklibname graphviztcl 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n tcl-graphviz
|
%description -n tcl-graphviz
|
||||||
This package provides the Tcl extension for %{name}.
|
This package provides the Tcl extension for %{name}.
|
||||||
|
|
||||||
%files -n tcl-graphviz
|
%files -n tcl-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/tcl*
|
%{_libdir}/tcl*
|
||||||
%{_libdir}/graphviz/tcl
|
%{_libdir}/graphviz/tcl
|
||||||
|
|
||||||
|
@ -288,13 +284,12 @@ This package provides the Tcl extension for %{name}.
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for java
|
Summary: Graphviz bindings for java
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
Obsoletes: %{mklibname graphvizjava 0}
|
Obsoletes: %{mklibname graphvizjava 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n java-graphviz
|
%description -n java-graphviz
|
||||||
This package provides the Java extension for %{name}.
|
This package provides the Java extension for %{name}.
|
||||||
|
|
||||||
%files -n java-graphviz
|
%files -n java-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/java
|
%{_libdir}/graphviz/java
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -304,13 +299,12 @@ This package provides the Java extension for %{name}.
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for R
|
Summary: Graphviz bindings for R
|
||||||
BuildRequires: libRmath-devel
|
BuildRequires: libRmath-devel
|
||||||
Obsoletes: %{mklibname graphvizr 0}
|
Obsoletes: %{mklibname graphvizr 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n r-graphviz
|
%description -n r-graphviz
|
||||||
This package provides the R extension for %{name}.
|
This package provides the R extension for %{name}.
|
||||||
|
|
||||||
%files -n r-graphviz
|
%files -n r-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/R
|
%{_libdir}/graphviz/R
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@ -320,26 +314,23 @@ This package provides the R extension for %{name}.
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Summary: Graphviz bindings for OCaml
|
Summary: Graphviz bindings for OCaml
|
||||||
BuildRequires: ocaml
|
BuildRequires: ocaml
|
||||||
Obsoletes: %{mklibname graphvizocaml 0}
|
Obsoletes: %{mklibname graphvizocaml 0} < 2.28.0-4
|
||||||
|
|
||||||
%description -n ocaml-graphviz
|
%description -n ocaml-graphviz
|
||||||
This package provides the OCaml extension for %{name}.
|
This package provides the OCaml extension for %{name}.
|
||||||
|
|
||||||
%files -n ocaml-graphviz
|
%files -n ocaml-graphviz
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/ocaml
|
%{_libdir}/graphviz/ocaml
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
%define oldmajor 3
|
|
||||||
|
|
||||||
%package -n %{develname}
|
%package -n %{develname}
|
||||||
Group: Development/Other
|
Group: Development/Other
|
||||||
Summary: Development package for %{name}
|
Summary: Development package for %{name}
|
||||||
Provides: %{name}-devel = %{version}-%{release}
|
Provides: %{name}-devel = %{version}-%{release}
|
||||||
Obsoletes: %{mklibname graphviz -d 7}
|
Obsoletes: %{mklibname graphviz -d 7} < 2.28.0-4
|
||||||
Obsoletes: %{mklibname graphviztcl -d 7}
|
Obsoletes: %{mklibname tcl -d 7} < 2.28.0-4
|
||||||
Obsoletes: %{mklibname -d %name %oldmajor}
|
Obsoletes: %{mklibname -d graphviz 3} < 2.28.0-4
|
||||||
Requires: %{lib_cdt} = %{version}
|
Requires: %{lib_cdt} = %{version}
|
||||||
Requires: %{lib_cgraph} = %{version}
|
Requires: %{lib_cgraph} = %{version}
|
||||||
Requires: %{lib_graph} = %{version}
|
Requires: %{lib_graph} = %{version}
|
||||||
|
@ -347,18 +338,14 @@ Requires: %{lib_gvc} = %{version}
|
||||||
Requires: %{lib_gvpr} = %{version}
|
Requires: %{lib_gvpr} = %{version}
|
||||||
Requires: %{lib_pathplan} = %{version}
|
Requires: %{lib_pathplan} = %{version}
|
||||||
Requires: %{lib_xdot} = %{version}
|
Requires: %{lib_xdot} = %{version}
|
||||||
Requires: %{name} = %{version}
|
|
||||||
|
|
||||||
%description -n %{develname}
|
%description -n %{develname}
|
||||||
Development package for %{name}.
|
Development package for %{name}.
|
||||||
|
|
||||||
%files -n %{develname}
|
%files -n %{develname}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
%{_libdir}/graphviz/*.so
|
%{_libdir}/graphviz/*.so
|
||||||
%{_libdir}/graphviz/*.la
|
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/*.la
|
|
||||||
%{_includedir}/graphviz
|
%{_includedir}/graphviz
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
@ -369,13 +356,12 @@ Group: Development/Other
|
||||||
Summary: Static development package for %{name}
|
Summary: Static development package for %{name}
|
||||||
Requires: %{develname} = %{version}-%{release}
|
Requires: %{develname} = %{version}-%{release}
|
||||||
Provides: %{name}-static-devel = %{version}-%{release}
|
Provides: %{name}-static-devel = %{version}-%{release}
|
||||||
Obsoletes: %mklibname -d -s %name %oldmajor
|
Obsoletes: %{mklibname -d -s graphviz 3} < 2.28.0-4
|
||||||
|
|
||||||
%description -n %{staticname}
|
%description -n %{staticname}
|
||||||
Static development package for %{name}.
|
Static development package for %{name}.
|
||||||
|
|
||||||
%files -n %{staticname}
|
%files -n %{staticname}
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_libdir}/graphviz/*.a
|
%{_libdir}/graphviz/*.a
|
||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
|
|
||||||
|
@ -385,7 +371,11 @@ Static development package for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p0 -b .link
|
||||||
%patch4 -p1 -b .format
|
%patch4 -p1 -b .format
|
||||||
|
%patch5 -p1 -b .ruby19~
|
||||||
|
%patch6 -p1 -b .automake~
|
||||||
|
autoreconf -f
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure2_5x \
|
%configure2_5x \
|
||||||
|
@ -412,7 +402,7 @@ Static development package for %{name}.
|
||||||
--disable-io \
|
--disable-io \
|
||||||
--disable-dependency-tracking
|
--disable-dependency-tracking
|
||||||
|
|
||||||
%make TK_LIB_SPEC="-ltcl -ltk"
|
%make TK_LIB_SPEC="-ltcl -ltk" LIBS="-lX11"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
@ -423,19 +413,42 @@ install -d -m 755 %{buildroot}%{_docdir}
|
||||||
mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}
|
mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}
|
||||||
mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name}
|
mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name}
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{_bindir}/dot -c
|
%{_bindir}/dot -c
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
|
if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 11 2011 Funda Wang <fwang@mandriva.org> 2.28.0-1mdv2011.0
|
* Thu Feb 16 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 2.28.0-4
|
||||||
|
+ Revision: 774845
|
||||||
|
- fix breakage with newer automake (P6)
|
||||||
|
- fix build with ruby 1.9 (P5)
|
||||||
|
- mass rebuild of ruby packages against ruby 1.9.1
|
||||||
|
|
||||||
|
* Sun Jan 22 2012 Oden Eriksson <oeriksson@mandriva.com> 2.28.0-3
|
||||||
|
+ Revision: 765932
|
||||||
|
- rebuilt for perl-5.14.2
|
||||||
|
|
||||||
|
* Wed Dec 14 2011 Oden Eriksson <oeriksson@mandriva.com> 2.28.0-2
|
||||||
|
+ Revision: 741372
|
||||||
|
- revert the last commit as it didn't work and we need to move forward...
|
||||||
|
- fix linkage (funda wang)
|
||||||
|
|
||||||
|
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||||
|
- don't manually remove .la files in %%install, it's handled by spec-helper now
|
||||||
|
|
||||||
|
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||||
|
- added fixes for linking
|
||||||
|
- fixed BRs
|
||||||
|
- rebuild
|
||||||
|
- cleaned up spec
|
||||||
|
- converted BRs to pkgconfig provides
|
||||||
|
- removed .la files
|
||||||
|
- removed mkrel, buildroot, defattr, clean section
|
||||||
|
- req for devel pkg to main
|
||||||
|
|
||||||
|
* Wed May 11 2011 Funda Wang <fwang@mandriva.org> 2.28.0-1
|
||||||
+ Revision: 673577
|
+ Revision: 673577
|
||||||
- New version 2.28.0
|
- New version 2.28.0
|
||||||
|
|
||||||
|
@ -633,7 +646,7 @@ if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
|
||||||
- rebuild
|
- rebuild
|
||||||
- kill re-definition of %%buildroot on Pixel's request
|
- kill re-definition of %%buildroot on Pixel's request
|
||||||
|
|
||||||
+ Olivier Blin <oblin@mandriva.com>
|
+ Olivier Blin <blino@mandriva.org>
|
||||||
- restore BuildRoot
|
- restore BuildRoot
|
||||||
|
|
||||||
+ Lev Givon <lev@mandriva.org>
|
+ Lev Givon <lev@mandriva.org>
|
||||||
|
|
Loading…
Add table
Reference in a new issue