diff --git a/graphviz-perl-set_rpath.patch b/graphviz-perl-set_rpath.patch deleted file mode 100644 index 20d8edc..0000000 --- a/graphviz-perl-set_rpath.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: tclpkg/gv/Makefile.am -=================================================================== ---- tclpkg/gv/Makefile.am.orig 2010-06-15 11:37:15.082918277 +0200 -+++ tclpkg/gv/Makefile.am 2010-06-15 11:38:05.966918325 +0200 -@@ -120,13 +120,18 @@ gv.cmxa: gv.cmx - ocamlopt -a -o gv.cmxa gv.cmx - gv.a: gv.cmxa - -+PERL ?= perl -+PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts) -+PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts) -+VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};') -+ - pkgperldir = $(pkglibdir)/perl - PERL_data = gv.pm - nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data) - libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c - libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS) --libgv_perl_la_LDFLAGS = -module -avoid-version --libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES) -+libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD) -+libgv_perl_la_CPPFLAGS = $(AM_CPPFLAGS) $(PERL_CC) - $(PERL_data): gv_perl.cpp - gv_perl.cpp: gv.i - $(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 279da0e..440dfdd 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 15 11:39:04 CEST 2010 - pth@suse.de - -- Readd AM_CPPFLAGS for libgv_perl. - -------------------------------------------------------------------- -Fri Jun 11 12:12:20 CEST 2010 - pth@suse.de - -- Set rpath for libperl (bnc#612766). - ------------------------------------------------------------------- Wed Jun 2 14:05:46 CEST 2010 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 6922248..b574371 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -25,7 +25,7 @@ BuildRequires: bison flex glib2-devel m4 perl python-devel tk-devel >= 8.3 xorg 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: graphviz gtkglext-devel libglade2-devel libgnomeui-devel ghostscript-mini +BuildRequires: graphviz gtkglext-devel libglade2-devel libgnomeui-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -40,16 +40,12 @@ 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 #Patches above 100 are graphviz-plugins specific. 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 @@ -382,15 +378,11 @@ Authors: %patch3 %patch11 %patch13 -%patch14 -%patch15 -%patch16 %patch100 %patch101 %patch103 %patch104 %patch105 -p1 -%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 diff --git a/graphviz-sequence_point.patch b/graphviz-sequence_point.patch deleted file mode 100644 index 7df8f71..0000000 --- a/graphviz-sequence_point.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/sfio/sfhdr.h -=================================================================== ---- lib/sfio/sfhdr.h.orig 2009-06-03 03:10:55.000000000 +0200 -+++ lib/sfio/sfhdr.h 2010-06-10 18:27:21.482363490 +0200 -@@ -732,7 +732,7 @@ extern "C" { - #define _SFOPENWR(f) ((f)->endw = ((f)->flags&(SF_MTSAFE|SF_LINE)) ? (f)->data : (f)->endb) - #define _SFOPEN(f) ((f)->mode == SF_READ ? _SFOPENRD(f) : \ - (f)->mode == SF_WRITE ? _SFOPENWR(f) : \ -- ((f)->endr = (f)->endr = (f)->data) ) -+ ((f)->endr = (f)->endw = (f)->data) ) - #define SFOPEN(f,l) (void)((l) ? 0 : \ - ((f)->mode &= ~(SF_LOCK|SF_RC|SF_RV), _SFOPEN(f), 0) ) - diff --git a/graphviz.changes b/graphviz.changes index 30b6fa2..37e82ad 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 11 12:13:12 CEST 2010 - pth@suse.de - -- Fix cut&paste error. -- Plugin configuration file is now named config6 so adapt spec file - (bnc#607114). - ------------------------------------------------------------------- Tue Jun 1 16:29:05 UTC 2010 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 627c8b2..f99744e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -15,8 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -#name of the plugin config file that dot creates -%define config_file config6 + Name: graphviz BuildRequires: fdupes libexpat-devel libjpeg-devel libpng-devel zlib-devel @@ -38,7 +37,6 @@ 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 Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -97,7 +95,6 @@ Authors: %patch13 %patch14 %patch15 -%patch16 # 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 @@ -177,11 +174,11 @@ rm -f %{_libdir}/graphviz/libgvplugin_gtk* /sbin/ldconfig # 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." +test -s %{_libdir}/graphviz/config || echo "%{_libdir}/graphviz/config doesn't exist! Check installation." %postun /sbin/ldconfig -eblif ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/%{config_file}; fi +if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/config; fi %files %defattr(-,root,root)