commit tulip for openSUSE:Factory
Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at Mon Nov 16 16:22:45 CET 2009. -------- --- tulip/tulip.changes 2009-07-29 10:34:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2009-11-15 18:18:10.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Nov 15 18:17:54 CET 2009 - meissner@suse.de + +- disable parallel build, it breaks. + +------------------------------------------------------------------- +Mon Sep 7 16:35:52 CEST 2009 - kkaempf@suse.de + +- Fix x86_64 build and pathes. (Tracker #2853634 upstream) +- Make buildrequire backward-compatible. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tulip-3.2.0.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.QES19P/_old 2009-11-16 16:16:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QES19P/_new 2009-11-16 16:16:23.000000000 +0100 @@ -19,7 +19,12 @@ Name: tulip -BuildRequires: Mesa-devel doxygen freefont ftgl-devel glew-devel libdrm-devel libgle-devel libjpeg-devel libqt4-devel libxml2-devel update-alternatives update-desktop-files xorg-x11-devel +BuildRequires: Mesa-devel doxygen freefont ftgl-devel glew-devel libdrm-devel libjpeg-devel libqt4-devel libxml2-devel update-alternatives update-desktop-files xorg-x11-devel +%if 0%{?suse_version} > 1110 +BuildRequires: libgle-devel +%else +BuildRequires: gle +%endif # These are for (cd docs; make html) below # To speed up build time, this is pre-generated #BuildRequires: doxygen graphviz-gd xmltex passivetex texlive texlive-bin java libqt4-devel-doc-data @@ -28,7 +33,7 @@ %endif Summary: Visualization of huge graphs Version: 3.2.0 -Release: 1 +Release: 2 Prefix: /usr # .so version %define tulip_version 3.2 @@ -40,6 +45,7 @@ Source2: tulip-%{version}-userManual.pdf Source3: tulip-%{version}-devHandbook.pdf Source4: tulip-rpmlintrc +Patch: %{name}-%{version}.dif License: GPL v2 or later Group: Productivity/Graphics/Visualization/Graph Requires: Mesa @@ -272,6 +278,7 @@ %prep %setup -q +%patch -p0 %build %{?suse_update_config:%{suse_update_config -f}} @@ -295,7 +302,8 @@ --x-libraries=/usr/%{_lib} \ --with-gl-includes=/usr/include \ --with-gl-libraries=/usr/%{_lib} -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?jobs:-j %jobs} +# parallel make is not working, do not use it. -Marcus 20091115 +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" # generating docs during build is disabled #(cd docs; make html) # copy pre-generated docs instead ++++++ tulip-3.2.0.dif ++++++ diff -wruN ../orig-tulip-3.2.0/configure.in ./configure.in --- ../orig-tulip-3.2.0/configure.in 2009-06-29 09:27:48.000000000 +0200 +++ ./configure.in 2009-09-07 17:08:44.000000000 +0200 @@ -216,8 +216,8 @@ then if test "${x_includes}" != "NONE" -a "${x_includes}" != "" then - CPPFLAGS="${CPP_FLAGS} -I${x_includes}" - LDFLAGS="${LD_FLAGS} -L${x_libraries}" + CPPFLAGS="${CPPFLAGS} -I${x_includes}" + LDFLAGS="${LDFLAGS} -L${x_libraries}" fi fi AC_PATH_GL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de