rpm/graphviz
SHA256
1
0
Fork 0
forked from pool/graphviz
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=13

Browse Source
This commit is contained in:
OBS User unknown 2007-10-26 18:40:25 +00:00 committed by Git OBS Bridge
parent 04920accc8
commit 256d248ba8
8 changed files with 174 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
graphviz-missing_includes.patch Normal file
View File

@ -0,0 +1,37 @@
--- lib/vpsc/csolve_VPSC.cpp
+++ lib/vpsc/csolve_VPSC.cpp
@@ -21,7 +21,9 @@
#include <generate-constraints.h>
#include <solve_VPSC.h>
#include <cassert>
+#include <cstdlib>
#include "csolve_VPSC.h"
+
extern "C" {
Variable* newVariable(int id, double desiredPos, double weight) {
return new Variable(id,desiredPos,weight);
@@ -79,7 +81,7 @@
vpsc->satisfy();
} catch(const char *e) {
std::cerr << e << std::endl;
- exit(1);
+ std::exit(1);
}
}
int getSplitCnt(IncVPSC *vpsc) {
--- lib/vpsc/generate-constraints.cpp
+++ lib/vpsc/generate-constraints.cpp
@@ -18,11 +18,13 @@
#include <set>
#include <cassert>
+#include <cstdlib>
#include "generate-constraints.h"
#include "constraint.h"
using std::set;
using std::vector;
+using std::qsort;
std::ostream& operator <<(std::ostream &os, const Rectangle &r) {
os << "{"<<r.minX<<","<<r.maxX<<","<<r.minY<<","<<r.maxY<<"},";

101
graphviz-module_avoid-version.patch Normal file
View File

@ -0,0 +1,101 @@
--- tclpkg/gv/Makefile.am 2007/08/29 12:36:07 1.19
+++ tclpkg/gv/Makefile.am 2007/08/29 12:38:36
@@ -19,7 +19,7 @@
nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_hdr)
libgv_sharp_la_SOURCES = $(BASESOURCES)
libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@
-libgv_sharp_la_LDFLAGS =
+libgv_sharp_la_LDFLAGS = -module -avoid-version
gv_sharp.cpp $(SHARP_hdr): gv.i
$(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
@@ -28,7 +28,7 @@
nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_hdr)
libgv_guile_la_SOURCES = $(BASESOURCES)
libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
-libgv_guile_la_LDFLAGS =
+libgv_guile_la_LDFLAGS = -module -avoid-version
gv_guile.cpp $(GUILE_hdr): gv.i
$(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i
$(SED) -e 's/SWIG_GUILE_INIT_STATIC void/void/' <gv_guile.cpp >t
@@ -39,7 +39,7 @@
nodist_libgv_io_la_SOURCES = gv_io.cpp $(IO_hdr)
libgv_io_la_SOURCES = $(BASESOURCES)
libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@
-libgv_io_la_LDFLAGS =
+libgv_io_la_LDFLAGS = -module -avoid-version
gv_io.cpp $(IO_hdr): gv.i
$(SWIG) -c++ -io -o gv_io.cpp $(srcdir)/gv.i
@@ -48,7 +48,7 @@
nodist_libgv_java_la_SOURCES = gv_java.cpp
libgv_java_la_SOURCES = $(BASESOURCES)
libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
-libgv_java_la_LDFLAGS =
+libgv_java_la_LDFLAGS = -module -avoid-version
gv_java.cpp $(JAVA_hdr): gv.i
$(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i
@@ -59,7 +59,7 @@
#libgv_lua_la_CFLAGS = -fno-strict-aliasing
libgv_lua_la_CXXFLAGS = -fno-strict-aliasing
libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
-libgv_lua_la_LDFLAGS =
+libgv_lua_la_LDFLAGS = -module -avoid-version
gv_lua.cpp $(LUA_hdr): gv.i
$(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
@@ -68,7 +68,7 @@
nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_hdr)
libgv_ocaml_la_SOURCES = $(BASESOURCES)
libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
-libgv_ocaml_la_LDFLAGS =
+libgv_ocaml_la_LDFLAGS = -module -avoid-version
gv_ocaml.cpp $(OCAML_hdr): gv.i
$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
@@ -79,7 +79,7 @@
#libgv_perl_la_CFLAGS = -fno-strict-aliasing
libgv_perl_la_CXXFLAGS = -fno-strict-aliasing
libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
-libgv_perl_la_LDFLAGS =
+libgv_perl_la_LDFLAGS = -module -avoid-version
gv_perl.cpp $(PERL_hdr): gv.i
$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
@@ -89,7 +89,7 @@
libgv_php_la_CXXFLAGS = -fno-strict-aliasing
libgv_php_la_SOURCES = $(BASESOURCES)
libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
-libgv_php_la_LDFLAGS =
+libgv_php_la_LDFLAGS = -module -avoid-version
gv_php.cpp $(PHP_hdr): gv.i
$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
@@ -98,7 +98,7 @@
nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_hdr)
libgv_python_la_SOURCES = $(BASESOURCES)
libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
-libgv_python_la_LDFLAGS =
+libgv_python_la_LDFLAGS = -module -avoid-version
gv_python.cpp $(PYTHON_hdr): gv.i
$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
@@ -107,7 +107,7 @@
nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_hdr)
libgv_ruby_la_SOURCES = $(BASESOURCES)
libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
-libgv_ruby_la_LDFLAGS =
+libgv_ruby_la_LDFLAGS = -module -avoid-version
gv_ruby.cpp $(RUBY_hdr): gv.i
$(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
@@ -116,7 +116,7 @@
nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr)
libgv_tcl_la_SOURCES = $(BASESOURCES)
libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
-libgv_tcl_la_LDFLAGS =
+libgv_tcl_la_LDFLAGS = -module -avoid-version
gv_tcl.cpp $(TCL_hdr): gv.i
$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i

11
graphviz-plugins-rpmlintrc
View File

@ -1,11 +0,0 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("graphviz-tcl devel-file-in-non-devel-package")
addFilter("graphviz-sharp devel-file-in-non-devel-package")
addFilter("graphviz-ruby devel-file-in-non-devel-package")
addFilter("graphviz-python devel-file-in-non-devel-package")
addFilter("graphviz-php devel-file-in-non-devel-package")
addFilter("graphviz-perl devel-file-in-non-devel-package")
addFilter("graphviz-lua devel-file-in-non-devel-package")
addFilter("graphviz-guile devel-file-in-non-devel-package")

5
graphviz-plugins.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 26 17:34:08 CEST 2007 - pth@suse.de
- Add missing includes.
-------------------------------------------------------------------
Thu Aug 16 12:32:06 CEST 2007 - pth@suse.de

16
graphviz-plugins.spec
View File

@ -24,12 +24,12 @@ BuildRequires: graphviz libgnomeui-devel php5-devel
BuildRequires: fdupes
%endif
Version: 2.12
Release: 10
Autoreqprov: on
Release: 11
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
#Source1: %{name}-rpmlintrc
Patch0: graphviz-fix-pkgIndex.patch
Patch1: graphviz-aliasing-fixes.patch
Patch3: graphviz-fix_swig_template.patch
@ -42,7 +42,9 @@ Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-php5_include_dirs.patch
Patch13: graphviz-codecleanup.patch
URL: http://www.graphviz.org/
Patch14: graphviz-module_avoid-version.patch
Patch15: graphviz-missing_includes.patch
Url: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -319,6 +321,8 @@ Authors:
%patch11
%patch12
%patch13
%patch14
%patch15
# 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
@ -394,7 +398,6 @@ for lang in ruby python lua ocaml sharp guile php; do
mv %{buildroot}%{_libdir}/%{mname}/$lang/gv_$lang.man %{buildroot}%{_mandir}/man3/gv_$lang.3
done
%if 0%{?suse_version} > 1020
%fdupes -s %{buildroot}%{_docdir}
%endif
@ -467,8 +470,9 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%docdir %{_defaultdocdir}/%{mname}
%defattr(-,root,root,-)
%doc __doc/*
%changelog
* Fri Oct 26 2007 - pth@suse.de
- Add missing includes.
* Thu Aug 16 2007 - pth@suse.de
- Add missing BuildRequires for fdupes
- Guard fdupes by check for suse_version

8
graphviz-rpmlintrc Normal file
View File

@ -0,0 +1,8 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("graphviz shlib-policy-missing-suffix")
addFilter("graphviz rpm-buildroot-usage")
addFilter("graphviz postun-without-ldconfig")
addFilter("graphviz non-devel-buildrequires")
addFilter("graphviz %install-no-mkdir-buildroot")

5
graphviz.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 26 17:33:40 CEST 2007 - pth@suse.de
- Add missing includes.
-------------------------------------------------------------------
Mon Aug 13 19:23:50 CEST 2007 - pth@suse.de

13
graphviz.spec
View File

@ -17,11 +17,12 @@ 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
Version: 2.12
Release: 37
Autoreqprov: on
Release: 59
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2
Source2: graphviz-rpmlintrc
Patch0: graphviz-fix-pkgIndex.patch
Patch1: graphviz-aliasing-fixes.patch
Patch3: graphviz-fix_swig_template.patch
@ -33,7 +34,8 @@ Patch9: graphviz-no_libtool_patching.patch
Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-codecleanup.patch
URL: http://www.graphviz.org/
Patch13: graphviz-missing_includes.patch
Url: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -92,6 +94,7 @@ Authors:
%patch10
%patch11
%patch12
%patch13
# 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
@ -130,7 +133,6 @@ make install \
docdir=%{buildroot}%{_docdir}/%{name} \
pkgconfigdir=%{_libdir}/pkgconfig
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
#rm -rf %{buildroot}/usr/%{_lib}/pkgconfig # ?
mkdir -p %{buildroot}/%{_docdir}
mkdir -p %{buildroot}%{_datadir}/%{name}
rm -f %buildroot/%{_libdir}/%{name}/pkgIndex.tcl
@ -198,8 +200,9 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%exclude %{_libdir}/graphviz/*/*
%exclude %{_libdir}/graphviz/libgvplugin*
%exclude %{_libdir}/graphviz/*.so
%changelog
* Fri Oct 26 2007 - pth@suse.de
- Add missing includes.
* Mon Aug 13 2007 - pth@suse.de
- lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
- use -fno-strict-aliasing for gv_php