diff --git a/graphviz-2.28.0-linkage.patch b/graphviz-2.28.0-linkage.patch new file mode 100644 index 0000000..44bf4be --- /dev/null +++ b/graphviz-2.28.0-linkage.patch @@ -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 diff --git a/graphviz.spec b/graphviz.spec index 68748b3..3172b78 100644 --- a/graphviz.spec +++ b/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_with libr @@ -22,44 +26,47 @@ Summary: Graph visualization tools Name: graphviz Version: 2.28.0 -Release: %mkrel 1 +Release: 3 Group: Graphics License: Common Public License 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 BuildRequires: bison >= 2.3 BuildRequires: flex >= 2.5.4a +BuildRequires: libtool BuildRequires: swig >= 1.3.29 -BuildRequires: freetype2-devel >= 2.1.10 -BuildRequires: pango-devel >= 1.12.4 +BuildRequires: expat-devel BuildRequires: gd-devel >= 2.0.34 BuildRequires: gettext-devel >= 0.14.5 -BuildRequires: libcurl-devel -BuildRequires: libjpeg-devel -BuildRequires: libtool +# jpeg: No (only required by internal libgd) +#BuildRequires: jpeg-devel BuildRequires: libltdl-devel -BuildRequires: libpng-devel >= 1.2.10 -BuildRequires: librsvg-devel -BuildRequires: libx11-devel -BuildRequires: libxaw-devel -BuildRequires: libxmu-devel -BuildRequires: libxt-devel -BuildRequires: gtk+2-devel -BuildRequires: gtkglarea2-devel -BuildRequires: gtkglext-devel -BuildRequires: zlib-devel >= 1.2.3 -BuildRequires: libexpat-devel >= 2.0.0 -BuildRequires: libfontconfig-devel >= 2.3.95 +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glut) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtkglext-1.0) +BuildRequires: pkgconfig(gtkgl-2.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(pangocairo) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zlib) + Conflicts: %{mklibname graphviz 4} < 2.20.3-3 -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot %description A collection of tools for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). %files -%defattr(-,root,root) %dir %{_libdir}/%{name} %{_bindir}/* %_mandir/man?/* @@ -76,7 +83,6 @@ Summary: %{name} documentation The %{name} documentation. %files doc -%defattr(-,root,root) %{_datadir}/doc/%{name} #------------------------------------------------------------------------- @@ -90,7 +96,6 @@ Conflicts: %{_lib}graphviz4 < 2.26 This package provides the cdt shared library for %{name}. %files -n %{lib_cdt} -%defattr(-,root,root) %{_libdir}/libcdt.so.%{cdt_major}* #------------------------------------------------------------------------- @@ -104,7 +109,6 @@ Conflicts: %{_lib}graphviz4 < 2.26 This package provides the cgraph shared library for %{name}. %files -n %{lib_cgraph} -%defattr(-,root,root) %{_libdir}/libcgraph.so.%{cgraph_major}* #------------------------------------------------------------------------- @@ -133,7 +137,6 @@ Conflicts: %{_lib}graphviz4 < 2.26 This package provides the gvc shared library for %{name}. %files -n %{lib_gvc} -%defattr(-,root,root) %{_libdir}/libgvc.so.%{gvc_major}* #------------------------------------------------------------------------- @@ -146,7 +149,6 @@ Summary: Shared library for %{name} This package provides the gvpr shared library for %{name}. %files -n %{lib_gvpr} -%defattr(-,root,root) %{_libdir}/libgvpr.so.%{gvpr_major}* #------------------------------------------------------------------------- @@ -160,7 +162,6 @@ Conflicts: %{_lib}graphviz4 < 2.26 This package provides the pathplan shared library for %{name}. %files -n %{lib_pathplan} -%defattr(-,root,root) %{_libdir}/libpathplan.so.%{pathplan_major}* #------------------------------------------------------------------------- @@ -173,7 +174,6 @@ Summary: Shared library for %{name} This package provides the xdot shared library for %{name}. %files -n %{lib_xdot} -%defattr(-,root,root) %{_libdir}/libxdot.so.%{xdot_major}* #------------------------------------------------------------------------- @@ -190,7 +190,6 @@ Obsoletes: %{mklibname graphvizlua 0} This package provides the Lua extension for %{name}. %files -n lua-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/lua %{_libdir}/lua/%{lua_version}/gv.so @@ -207,7 +206,6 @@ Obsoletes: %{mklibname graphvizphp 0} This package provides the PHP extension for %{name}. %files -n php-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/php %{_libdir}/php/modules/gv.so %{_datadir}/php/gv.php @@ -224,7 +222,6 @@ Obsoletes: %{mklibname graphvizpython 0} This package provides the Python extension for %{name}. %files -n python-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/python %py_platsitedir/* @@ -240,7 +237,6 @@ Obsoletes: %{mklibname graphvizruby 0} This package provides the Ruby extension for %{name}. %files -n ruby-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/ruby %{_prefix}/lib/ruby @@ -256,7 +252,6 @@ Obsoletes: %{mklibname graphvizperl 0} This package provides the Perl extension for %{name}. %files -n perl-graphviz -%defattr(-,root,root) %{perl_vendorarch}/* %{_libdir}/graphviz/perl @@ -275,7 +270,6 @@ Obsoletes: %{mklibname graphviztcl 0} This package provides the Tcl extension for %{name}. %files -n tcl-graphviz -%defattr(-,root,root) %{_libdir}/tcl* %{_libdir}/graphviz/tcl @@ -294,7 +288,6 @@ Obsoletes: %{mklibname graphvizjava 0} This package provides the Java extension for %{name}. %files -n java-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/java #------------------------------------------------------------------------- @@ -310,7 +303,6 @@ Obsoletes: %{mklibname graphvizr 0} This package provides the R extension for %{name}. %files -n r-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/R %endif @@ -326,7 +318,6 @@ Obsoletes: %{mklibname graphvizocaml 0} This package provides the OCaml extension for %{name}. %files -n ocaml-graphviz -%defattr(-,root,root) %{_libdir}/graphviz/ocaml #------------------------------------------------------------------------- @@ -347,7 +338,6 @@ Requires: %{lib_gvc} = %{version} Requires: %{lib_gvpr} = %{version} Requires: %{lib_pathplan} = %{version} Requires: %{lib_xdot} = %{version} -Requires: %{name} = %{version} %description -n %{develname} Development package for %{name}. @@ -356,9 +346,7 @@ Development package for %{name}. %defattr(-,root,root) %{_libdir}/pkgconfig/* %{_libdir}/graphviz/*.so -%{_libdir}/graphviz/*.la %{_libdir}/*.so -%{_libdir}/*.la %{_includedir}/graphviz #------------------------------------------------------------------------- @@ -385,6 +373,7 @@ Static development package for %{name}. %prep %setup -q +%patch0 -p0 -b .link %patch4 -p1 -b .format %build @@ -412,20 +401,18 @@ Static development package for %{name}. --disable-io \ --disable-dependency-tracking -%make TK_LIB_SPEC="-ltcl -ltk" +%make TK_LIB_SPEC="-ltcl -ltk" LIBS="-lX11" %install rm -rf %{buildroot} %makeinstall_std +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' # fix documentation install -d -m 755 %{buildroot}%{_docdir} mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name} -%clean -rm -rf %{buildroot} - %post %{_bindir}/dot -c @@ -435,7 +422,29 @@ if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi %changelog -* Wed May 11 2011 Funda Wang 2.28.0-1mdv2011.0 +* Sun Jan 22 2012 Oden Eriksson 2.28.0-3 ++ Revision: 765932 +- rebuilt for perl-5.14.2 + +* Wed Dec 14 2011 Oden Eriksson 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 + - don't manually remove .la files in %%install, it's handled by spec-helper now + + + Matthew Dawkins + - 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 2.28.0-1 + Revision: 673577 - New version 2.28.0 @@ -633,7 +642,7 @@ if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi - rebuild - kill re-definition of %%buildroot on Pixel's request - + Olivier Blin + + Olivier Blin - restore BuildRoot + Lev Givon