diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes new file mode 100644 index 0000000..7d29a9b --- /dev/null +++ b/graphviz-gvedit.changes @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Wed Sep 11 13:42:43 CEST 2013 - pth@suse.de + +- Initial package split off from graphviz. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec new file mode 100644 index 0000000..1c1a219 --- /dev/null +++ b/graphviz-gvedit.spec @@ -0,0 +1,137 @@ +# +# spec file for package graphviz-gvedit +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define mname graphviz + +Name: graphviz-gvedit +Version: 2.34.0 +Release: 0 +Summary: Graph editor based on Qt +License: IPL-1.0 +Group: Productivity/Graphics/Visualization/Graph +Url: http://www.graphviz.org/ +Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Source2: graphviz-rpmlintrc +Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel >= 2 +BuildRequires: gcc-c++ +BuildRequires: libXaw-devel +BuildRequires: libexpat-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libqt4-devel +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: zlib-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +Requires(pre): /bin/cat +Requires(pre): /bin/rm +Recommends: graphviz = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This is the graph editor included with graphviz, packaged +separately to avoid cycles in the build of the graphviz +package. + +%prep +%setup -q -n %{mname}-%{version} +%patch2 +%patch3 + +# 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 + +%build +autoreconf -fi +WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" +CFLAGS="%{optflags} $WARN_FLAGS" +%ifarch %ix86 x86_64 +CFLAGS="$CFLAGS -ffast-math" +%endif + +export CFLAGS="$CFLAGS" +export CPPFLAGS="%{optflags}" +%configure \ + --with-x \ + --with-mylibgd \ + --disable-static \ + --enable-ltdl-install=no \ + --with-ipsepcola \ + --without-ming \ + --disable-io \ + --disable-silent-rules \ + --with-mylibgd=no \ + --with-libgd=no +make %{?_smp_mflags} DESTDIR=%{buildroot} + +%install +make install \ + DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{mname} \ + pkgconfigdir=%{_libdir}/pkgconfig + +find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f + +mkdir -p %{buildroot}/%{_docdir} +mkdir -p %{buildroot}%{_datadir}/%{mname} + +rm -f %{buildroot}/%{_libdir}/%{mname}/pkgIndex.tcl + +cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc +rm -rf %{buildroot}%{_datadir}/%{mname}/doc + +rm -rf %{buildroot}%{_libdir} + +mv %{buildroot}/%{_mandir}/man1/gvedit.1 /tmp/gvedit.1 +rm -f %{buildroot}/%{_mandir}/man1/* +rm -rf %{buildroot}/%{_mandir}/man[37] +mv /tmp/gvedit.1 %{buildroot}/%{_mandir}/man1/gvedit.1 + +mv %{buildroot}/%{_bindir}/gvedit /tmp/gvedit +rm -f %{buildroot}/%{_bindir}/* +mv /tmp/gvedit %{buildroot}/%{_bindir}/gvedit + +rm -rf %{buildroot}%{_datadir}/%{mname}/graphs +rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr +rm -rf %{buildroot}%{_datadir}/%{mname}/lefty +rm -rf %{buildroot}%{_includedir}/%{mname} + +%files +%defattr(-,root,root) +%doc COPYING +%attr(755,root,root) %{_bindir}/gvedit +%dir %{_datadir}/%{mname} +%dir %{_datadir}/%{mname}/gvedit +%{_datadir}/%{mname}/gvedit/attrs.txt +%doc %{_mandir}/man1/*.1* + +%changelog diff --git a/graphviz-no_strict_aliasing.patch b/graphviz-no_strict_aliasing.patch new file mode 100644 index 0000000..67e1d72 --- /dev/null +++ b/graphviz-no_strict_aliasing.patch @@ -0,0 +1,17 @@ +--- + lib/vmalloc/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +Index: lib/vmalloc/Makefile.am +=================================================================== +--- lib/vmalloc/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200 ++++ lib/vmalloc/Makefile.am 2013-09-11 18:51:30.719515603 +0200 +@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes + vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ + vmtrace.c vmwalk.c + ++libvmalloc_C_la_CFLAGS = -fno-strict-aliasing ++ + ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc + mkdir -p ${top_builddir}/FEATURE + ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@ diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index aab6121..0fbd1ca 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -7,6 +7,8 @@ Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de graphviz-type_punning.patch, graphviz-buffer_overflow.patch, graphviz-proper_prototypes.patch, graphviz-python_version.patch, graphviz-guile.patch, graphviz-java_in_lib64.patch +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. ------------------------------------------------------------------- Thu Sep 5 15:46:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index e2eb3e0..313080e 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -95,6 +95,9 @@ License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz +Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -266,6 +269,8 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} +%patch2 +%patch3 %patch100 %patch102 %patch103 diff --git a/graphviz-proper_prototypes.patch b/graphviz-proper_prototypes.patch deleted file mode 100644 index a2a8fc9..0000000 --- a/graphviz-proper_prototypes.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - lib/cdt/dthdr.h | 2 ++ - 1 file changed, 2 insertions(+) - -Index: lib/cdt/dthdr.h -=================================================================== ---- lib/cdt/dthdr.h.orig 2013-08-01 19:35:15.000000000 +0200 -+++ lib/cdt/dthdr.h 2013-09-05 17:48:19.736968083 +0200 -@@ -10,6 +10,8 @@ - - #if _PACKAGE_ast - #include -+#else -+#include - #endif - - #include diff --git a/graphviz-proper_use_of_qw.patch b/graphviz-proper_use_of_qw.patch deleted file mode 100644 index c16fe65..0000000 --- a/graphviz-proper_use_of_qw.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - config/config_perl.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: config/config_perl.pl -=================================================================== ---- config/config_perl.pl.orig 2013-08-01 19:35:15.000000000 +0200 -+++ config/config_perl.pl 2013-09-04 13:14:18.900954100 +0200 -@@ -14,7 +14,7 @@ if ($ARGV[0] eq "PERL_INSTALL_DIR") { - - my $d; - -- foreach $d qw(installvendorarch vendorarch installsitearch sitearch) { -+ foreach $d (qw(installvendorarch vendorarch installsitearch sitearch)) { - if (exists($Config{$d}) and defined($Config{$d}) and - ($Config{$d} ne '') ) { - print "$Config{$d}"; diff --git a/graphviz.changes b/graphviz.changes index 77f55e4..3033a63 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 11 18:55:22 CEST 2013 - pth@suse.de + +- Split off gvedit to it's own spec to avoid circular dependency + for graphviz and its sup packages. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + ------------------------------------------------------------------- Mon Sep 9 13:27:19 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 8a02e1b..0f580bb 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -29,6 +29,8 @@ Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources +Patch3: graphviz-no_strict_aliasing.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -88,6 +90,7 @@ Note: If you need output in png format you also need to install %prep %setup -q %patch2 +%patch3 # 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