Hello community, here is the log from the commit of package graphviz for openSUSE:Factory checked in at Sun Oct 2 10:10:16 CEST 2011.
-------- --- openSUSE:Factory/graphviz/graphviz-plugins.changes 2011-09-23 02:01:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/graphviz/graphviz-plugins.changes 2011-09-28 21:13:59.000000000 +0200 @@ -1,0 +2,28 @@ +Wed Sep 28 14:01:13 UTC 2011 - [email protected] + +- Fix compilation with new guile +- Update to version 2.28.0 + - incremented library api version: + libcdt, libgraph, libcgraph, libgvpr, libgvc + - Add gvmap, cluster and gvmap.sh + - Deprecate dotty; prefer gvedit + - Add patchwork supporting squarified tree maps + - Add ordering as a node attribute + - Fix problems with font resolution + - Fix problems with text placement + - Fix twopi to set root attribute + - Make available layouts and formats available via the API + - Fix error message system so that an application can capture the messages + - New attributes and features for sfdp + - gvgen now allows the user to specify graph name and node name template + - Make overlap=false denote overlap=prism + - More efficient xdot library + - HTML-like labels provide ID + - Fixed bugs: 1480 1980 2044 2087 2088 2089 2091 2093 2094 + 2095 2101 2102 2103 2104 2112 2113 2118 2128 2129 2139 2149 + 2157 2113 2159 2160 2161 2163 + - Add scale attribute to twopi + - Add <B>,<I>,<U> to html strings + - migrated to 2005 version of cdt + +------------------------------------------------------------------- --- openSUSE:Factory/graphviz/graphviz.changes 2011-09-23 02:01:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/graphviz/graphviz.changes 2011-09-28 21:14:00.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Sep 28 19:08:30 UTC 2011 - [email protected] + +- Update to version 2.28.0 + - incremented library api version: + libcdt, libgraph, libcgraph, libgvpr, libgvc + - Add gvmap, cluster and gvmap.sh + - Deprecate dotty; prefer gvedit + - Add patchwork supporting squarified tree maps + - Add ordering as a node attribute + - Fix problems with font resolution + - Fix problems with text placement + - Fix twopi to set root attribute + - Make available layouts and formats available via the API + - Fix error message system so that an application can capture the messages + - New attributes and features for sfdp + - gvgen now allows the user to specify graph name and node name template + - Make overlap=false denote overlap=prism + - More efficient xdot library + - HTML-like labels provide ID + - Fixed bugs: 1480 1980 2044 2087 2088 2089 2091 2093 2094 + 2095 2101 2102 2103 2104 2112 2113 2118 2128 2129 2139 2149 + 2157 2113 2159 2160 2161 2163 + - Add scale attribute to twopi + - Add <B>,<I>,<U> to html strings + - migrated to 2005 version of cdt + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- graphviz-2.26.3-libtool24.patch graphviz-2.26.3.tar.bz2 graphviz-neato_splines.patch graphviz-perl-set_rpath.patch graphviz-ruby-ppc.patch graphviz-sequence_point.patch graphviz-stddefs.patch graphviz-wrong_index.patch New: ---- graphviz-2.28.0.tar.gz graphviz-guile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz-plugins.spec ++++++ --- /var/tmp/diff_new_pack.v6hBXP/_old 2011-10-02 10:10:11.000000000 +0200 +++ /var/tmp/diff_new_pack.v6hBXP/_new 2011-10-02 10:10:11.000000000 +0200 @@ -19,44 +19,68 @@ %define mname graphviz Name: graphviz-plugins -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 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: ghostscript-mini graphviz gtkglext-devel libglade2-devel libgnomeui-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: freetype2-devel >= 2 +BuildRequires: gcc-c++ +BuildRequires: gcc-java +BuildRequires: gd-devel +BuildRequires: ghostscript-mini +BuildRequires: gmp-devel +BuildRequires: graphviz +BuildRequires: gtkglext-devel +BuildRequires: guile-devel +BuildRequires: ksh +BuildRequires: libexpat-devel +BuildRequires: libgcj-devel +BuildRequires: libgnomeui-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +BuildRequires: lua-devel +BuildRequires: m4 +BuildRequires: mono-core +BuildRequires: ocaml +BuildRequires: perl +BuildRequires: php5-devel +BuildRequires: python-devel +BuildRequires: ruby-devel +BuildRequires: swig +BuildRequires: tk-devel >= 8.3 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libICE-devel +BuildRequires: xorg-x11-libSM-devel +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXext-devel +BuildRequires: xorg-x11-libXmu-devel +BuildRequires: xorg-x11-libXpm-devel +BuildRequires: xorg-x11-libXt-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.26.3 -Release: 9 -AutoReqProv: on +Version: 2.28.0 +Release: 1 +License: IBM Public License .. Summary: Graph Visualization Tools +Url: http://www.graphviz.org/ Group: Productivity/Graphics/Visualization/Graph -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2 -#Source1: %{name}-rpmlintrc -Patch0: graphviz-fix-pkgIndex.patch -Patch3: graphviz-neato_splines.patch -Patch11: graphviz-2.20.2-interpreter_names.patch -Patch13: graphviz-stddefs.patch -Patch14: graphviz-gd_png_check_sig.patch -Patch15: graphviz-wrong_index.patch -Patch16: graphviz-sequence_point.patch -# PATCH-UPSTREAM see http://bugs.gentoo.org/339298 -Patch17: graphviz-2.26.3-libtool24.patch -#Patches above 100 are graphviz-plugins specific. +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Patch1: graphviz-gd_png_check_sig.patch Patch100: graphviz-plugins-fix_install_dirs.patch -Patch101: graphviz-plugins-tcl_install_dir.patch -Patch103: graphviz-2.18-do_not_use_ocamlopt.patch -Patch104: python-version.diff -Patch105: graphviz-ruby-ppc.patch -Patch106: graphviz-perl-set_rpath.patch -Url: http://www.graphviz.org/ -License: IBM Public License .. -Prefix: /usr +Patch101: python-version.diff +Patch102: graphviz-plugins-tcl_install_dir.patch +Patch103: graphviz-2.20.2-interpreter_names.patch +Patch104: graphviz-guile.patch +Patch105: graphviz-2.18-do_not_use_ocamlopt.patch +Patch106: graphviz-fix-pkgIndex.patch +Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: coreutils +Prefix: /usr %define rb_libdir %{_libdir}/ruby %define rb_sitedir %{rb_libdir}/site_ruby/%{rb_ver} %define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver} @@ -69,23 +93,24 @@ %package -n graphviz-gnome License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Graphviz plugins that use gtk/GNOME -PreReq: graphviz = %{version} -PreReq: coreutils -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires(pre): coreutils +Requires(pre): graphviz = %{version} Requires: xorg-x11-fonts +Provides: graphviz_plugin = %{version} %description -n graphviz-gnome Graphviz plugins that use gtk/GNOME. %package -n graphviz-gd License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Graphviz plugin for renderers based on gd -PreReq: graphviz = %{version} gd -PreReq: coreutils -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires(pre): coreutils +Requires(pre): gd +Requires(pre): graphviz = %{version} +Provides: graphviz_plugin = %{version} %description -n graphviz-gd The graphviz-gd package contains the gd extensions for the graphviz @@ -93,10 +118,11 @@ %package -n graphviz-guile License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Graph Visualization Tools -Requires: graphviz = %{version} guile -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: guile +Provides: graphviz_plugin = %{version} %description -n graphviz-guile A collection of tools and tcl packages for the manipulation and layout @@ -104,10 +130,11 @@ %package -n graphviz-java License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Graph Visualization Tools -Requires: graphviz = %{version} java -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: java +Provides: graphviz_plugin = %{version} %description -n graphviz-java A collection of tools and tcl packages for the manipulation and layout @@ -115,10 +142,11 @@ %package -n graphviz-lua License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Lua extension for graphviz -Requires: graphviz = %{version} lua -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: lua +Provides: graphviz_plugin = %{version} %description -n graphviz-lua The graphviz-lua package contains the lua extension for the graphviz @@ -126,10 +154,11 @@ %package -n graphviz-ocaml License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: OCAML extension for graphviz -Requires: graphviz = %{version} ocaml -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: ocaml +Provides: graphviz_plugin = %{version} %description -n graphviz-ocaml The graphviz-ocaml package contains the Objective Caml extension for @@ -137,11 +166,11 @@ %package -n graphviz-perl License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Perl extension for Graphviz +Group: Productivity/Graphics/Visualization/Graph Requires: graphviz = %{version} Requires: perl = %{perl_version} -Provides: graphviz_plugin = %{version}-%{release} +Provides: graphviz_plugin = %{version} %description -n graphviz-perl The graphviz-perl package contains the Perl extension for the graphviz @@ -149,10 +178,11 @@ %package -n graphviz-php License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: PHP Extension for Graphviz -Requires: graphviz = %{version} php5 -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: php5 +Provides: graphviz_plugin = %{version} %description -n graphviz-php The graphviz-php package contains the PHP extension for the graphviz @@ -160,10 +190,11 @@ %package -n graphviz-python License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Python Extension for Graphviz -Requires: graphviz = %{version} python -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: python +Provides: graphviz_plugin = %{version} %description -n graphviz-python The graphviz-python package contains the Python extension for the @@ -171,10 +202,11 @@ %package -n graphviz-ruby License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Ruby Extension for Graphviz -Requires: graphviz = %{version} ruby -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: ruby +Provides: graphviz_plugin = %{version} %description -n graphviz-ruby The graphviz-ruby package contains the ruby extension for the graphviz @@ -182,10 +214,11 @@ %package -n graphviz-sharp License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: C# Extension for Graphviz -Requires: graphviz = %{version} mono-core -Provides: graphviz_plugin = %{version}-%{release} +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: mono-core +Provides: graphviz_plugin = %{version} %description -n graphviz-sharp The graphviz-sharp package contains the C# extension for the graphviz @@ -193,10 +226,12 @@ %package -n graphviz-tcl License: IBM Public License .. -Group: Development/Libraries/Tcl Summary: Tcl extension tools for graphviz -Requires: graphviz = %{version} tcl >= 8.3 tk -Provides: graphviz_plugin = %{version}-%{release} +Group: Development/Libraries/Tcl +Requires: graphviz = %{version} +Requires: tcl >= 8.3 +Requires: tk +Provides: graphviz_plugin = %{version} %description -n graphviz-tcl The graphviz-tcl package contains the various tcl packages (extensions) @@ -204,47 +239,37 @@ %package -n graphviz-doc License: IBM Public License .. -Group: Productivity/Graphics/Visualization/Graph Summary: Documentation for graphviz +Group: Productivity/Graphics/Visualization/Graph %description -n graphviz-doc Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} -%patch0 -%patch3 -%patch11 -%patch13 -%patch14 -%patch15 -%patch16 -%patch17 -p1 +%patch1 %patch100 %patch101 +%patch102 %patch103 -%patch104 -%patch105 -p1 +%patch104 -p1 +%patch105 %patch106 + # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl -# remove broken macros -rm m4/iconv.m4 m4/lib-*.m4 -cp /usr/share/gettext/config.rpath config %build -./autogen.sh -touch tclpkg/gv/gv.i +autoreconf WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" -CFLAGS="$RPM_OPT_FLAGS $WARN_FLAGS" +CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 CFLAGS="$CFLAGS -ffast-math" %endif -CC=gcc -RANLIB=: -export CC RANLIB -export CFLAGS="$CFLAGS" -export CPPFLAGS="%optflags" + +export CFLAGS +export CXXFLAGS="$CXXFLAGS -fpermissive" +export CPPFLAGS="%{optflags}" %configure \ --with-x \ --disable-static \ @@ -253,13 +278,13 @@ --without-ming \ --enable-ltdl-install=no \ --disable-io -%{__make} DESTDIR=%buildroot %{?jobs:-j%jobs} +make DESTDIR=%{buildroot} %{?_smp_mflags} %install %makeinstall \ docdir=%{buildroot}%{_docdir}/%{mname} \ pkgconfigdir=%{_libdir}/pkgconfig -find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_datadir}/%{mname} mkdir -p %{buildroot}%{_datadir}/tcl/%{mname} @@ -272,8 +297,8 @@ 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}/usr/bin/* -rm -rf %{buildroot}/usr/include/graphviz +rm -f %{buildroot}%{_bindir}/* +rm -rf %{buildroot}%{_includedir}/graphviz rm -f %{buildroot}%{_libdir}/graphviz/config rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_core* rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_dot_layout* @@ -295,7 +320,7 @@ %endif #%clean #rm -rf %{buildroot} -%{__rm} -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} +rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib} %files -n graphviz-gd %defattr(-,root,root) ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.v6hBXP/_old 2011-10-02 10:10:11.000000000 +0200 +++ /var/tmp/diff_new_pack.v6hBXP/_new 2011-10-02 10:10:11.000000000 +0200 @@ -20,37 +20,42 @@ %define config_file config6 Name: graphviz -BuildRequires: fdupes libexpat-devel libjpeg-devel libpng-devel zlib-devel -BuildRequires: freetype2-devel >= 2 -BuildRequires: gcc-c++ 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: libtool -PreReq: /bin/rm -Version: 2.26.3 -Release: 12 -AutoReqProv: on +Version: 2.28.0 +Release: 1 +License: IBM Public License .. Summary: Graph Visualization Tools +Url: http://www.graphviz.org/ Group: Productivity/Graphics/Visualization/Graph -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2 +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc -Patch0: graphviz-fix-pkgIndex.patch -Patch3: graphviz-neato_splines.patch -Patch11: graphviz-2.20.2-interpreter_names.patch -Patch13: graphviz-stddefs.patch -Patch14: graphviz-gd_png_check_sig.patch -Patch15: graphviz-wrong_index.patch -Patch16: graphviz-sequence_point.patch -# PATCH-UPSTREAM see http://bugs.gentoo.org/339298 -Patch17: graphviz-2.26.3-libtool24.patch -Url: http://www.graphviz.org/ -License: IBM Public License .. -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: /bin/cat -Recommends: graphviz-gnome = %{version} +Patch1: graphviz-gd_png_check_sig.patch +Patch2: graphviz-fix-pkgIndex.patch +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: freetype2-devel >= 2 +BuildRequires: gcc-c++ +BuildRequires: libexpat-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libICE-devel +BuildRequires: xorg-x11-libSM-devel +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXext-devel +BuildRequires: xorg-x11-libXmu-devel +BuildRequires: xorg-x11-libXpm-devel +BuildRequires: xorg-x11-libXt-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig(glib-2.0) +Requires(pre): /bin/cat +Requires(pre): /bin/rm Recommends: graphviz-gd = %{version} +Recommends: graphviz-gnome = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Prefix: /usr %description A collection of tools and tcl packages for the manipulation and layout @@ -58,12 +63,21 @@ %package devel License: IBM Public License .. -Group: Development/Libraries/C and C++ Summary: Graphiviz development package +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: glibc-devel tcl-devel fontconfig-devel expat freetype2-devel -Requires: libjpeg-devel libpng-devel zlib-devel libtool perl -Requires: libstdc++-devel tk-devel +Requires: expat +Requires: fontconfig-devel +Requires: freetype2-devel +Requires: glibc-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libstdc++-devel +Requires: libtool +Requires: perl +Requires: tcl-devel +Requires: tk-devel +Requires: zlib-devel %description devel The graphviz-devel package contains all that's necessary for developing @@ -74,66 +88,53 @@ %prep %setup -q -%patch0 -%patch3 -%patch11 -%patch13 -%patch14 -%patch15 -%patch16 -%patch17 -p1 +%patch1 +%patch2 + # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl -# remove broken macros -rm m4/iconv.m4 m4/lib-*.m4 -cp /usr/share/gettext/config.rpath config %build -./autogen.sh -touch tclpkg/gv/gv.i WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" -CFLAGS="$RPM_OPT_FLAGS $WARN_FLAGS" +CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 CFLAGS="$CFLAGS -ffast-math" %endif -CC=gcc -RANLIB=: -export CC RANLIB + export CFLAGS="$CFLAGS" -export CPPFLAGS="%optflags" -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ +export CPPFLAGS="%{optflags}" +%configure \ --with-x \ --with-mylibgd \ --disable-static \ - --disable-dependency-tracking \ --enable-ltdl-install=no \ --with-ipsepcola \ --without-ming \ --disable-io -make %{?jobs:-j%jobs} DESTDIR=%buildroot +make %{?_smp_mflags} DESTDIR=%{buildroot} %install make install \ DESTDIR=%{buildroot} \ docdir=%{buildroot}%{_docdir}/%{name} \ pkgconfigdir=%{_libdir}/pkgconfig + find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f + mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_datadir}/%{name} -rm -f %buildroot/%{_libdir}/%{name}/pkgIndex.tcl + +rm -f %{buildroot}/%{_libdir}/%{name}/pkgIndex.tcl chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* + cp -a %{buildroot}%{_datadir}/%{name}/doc __doc rm -rf %{buildroot}%{_datadir}/%{name}/doc + mkdir -p %{buildroot}%{_libdir}/graphviz touch %{buildroot}%{_libdir}/graphviz/config -mkdir -p %{buildroot}/etc/ld.so.conf.d/ -cat <<EOF >%{buildroot}/etc/ld.so.conf.d/%{name}.conf + +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ +cat <<EOF >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf %{_libdir}/%{name} %{_libdir}/%{name}/sharp %{_libdir}/%{name}/java @@ -146,6 +147,7 @@ %{_libdir}/%{name}/guile %{_libdir}/%{name}/ruby EOF + #Correct the path to the shared library for manfile in $(find %{buildroot} -name \*.man); do sed -e 's$/usr/lib/graphviz$%{_libdir}/%{name}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile} @@ -154,12 +156,10 @@ rm -f %{_libdir}/graphviz/libgvplugin_pango* rm -f %{_libdir}/graphviz/libgvplugin_gdk_pixbuf* rm -f %{_libdir}/graphviz/libgvplugin_gtk* -#%clean -#rm -rf %buildroot %post /sbin/ldconfig -# run "dot -c" to generate plugin config %_libdir/graphviz/config +# run "dot -c" to generate plugin config %{_libdir}/graphviz/config dot -c test -s %{_libdir}/graphviz/%{config_file} || echo "%{_libdir}/graphviz/%{config_file} doesn't exist! Check installation." @@ -179,15 +179,8 @@ %dir %{_libdir}/%{name} %{_libdir}/*.so.* %{_libdir}/graphviz/*.so* -#%{_libdir}/graphviz/libgvplugin_core* -#%{_libdir}/graphviz/libgvplugin_dot_layout* -#%{_libdir}/graphviz/libgvplugin_neato_layout* -#%{_libdir}/graphviz/libgvplugin_xlib* -/etc/ld.so.conf.d/graphviz.conf +%{_sysconfdir}/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) ++++++ graphviz-guile.patch ++++++ --- graphviz-2.28.0/configure.ac.orig 2011-05-17 20:36:04.898079515 +0200 +++ graphviz-2.28.0/configure.ac 2011-05-17 21:16:08.718160002 +0200 @@ -676,7 +676,7 @@ if test "x$GUILE" = "x"; then use_guile="No (guile not available)" else - GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2` + GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.* \([[0-9.]*]\)$/\1/') GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` if test $GUILE_VERSION_MAJOR -lt 2; then @@ -691,12 +691,15 @@ if test "x$GUILE" = "x"; then use_guile="No (guile is too old)" else - GUILE_INCLUDES= - GUILE_LIBS= + GUILE_INCLUDES=$(guile-config compile) + GUILE_LIBS=$(guile-config link) + save_CPPFLAGS="$CPPFLAGS"; + CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"; AC_CHECK_HEADER(libguile.h,,[ use_guile="No (guile header missing)" GUILE= ]) + CPPFLAGS="$save_CPPFLAGS"; if test "x$GUILE" != "x"; then use_guile="Yes" AC_SUBST(GUILE_INCLUDES) ++++++ graphviz-plugins-tcl_install_dir.patch ++++++ --- /var/tmp/diff_new_pack.v6hBXP/_old 2011-10-02 10:10:11.000000000 +0200 +++ /var/tmp/diff_new_pack.v6hBXP/_new 2011-10-02 10:10:11.000000000 +0200 @@ -1,7 +1,7 @@ --- tclpkg/Makefile.am +++ tclpkg/Makefile.am @@ -15,9 +15,9 @@ - pkgpython25dir = $(pkglibdir)/python25 + pkgpython27dir = $(pkglibdir)/python27 pkgRdir = $(pkglibdir)/R pkgrubydir = $(pkglibdir)/ruby -pkgtcldir = $(pkglibdir)/tcl continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
