From e42463308452cf2949c3ab1bd7bd8aa6a46f28ac Mon Sep 17 00:00:00 2001 From: mycae Date: Jan 23 2011 19:58:13 +0000 Subject: * Update to 0.0.4 --- diff --git a/3Depict-0.0.3-texture-path.patch b/3Depict-0.0.3-texture-path.patch deleted file mode 100644 index cfc9ef4..0000000 --- a/3Depict-0.0.3-texture-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r bf43078bcaed src/basics.h ---- src/basics.h Fri Nov 26 00:20:07 2010 +0000 -+++ src/basics.h Fri Nov 26 00:21:07 2010 +0000 -@@ -107,7 +107,7 @@ - - //Mac - // - Look in cwd -- return std::string(name); -+ return std::string("/usr/share/3Depict/") + std::string(name); - } - - template diff --git a/3Depict-0.0.4-no-debug-wait-for-cin.patch b/3Depict-0.0.4-no-debug-wait-for-cin.patch new file mode 100644 index 0000000..62015d2 --- /dev/null +++ b/3Depict-0.0.4-no-debug-wait-for-cin.patch @@ -0,0 +1,19 @@ +--- src/basics.cpp 2011-01-23 03:08:13.000000000 +0000 ++++ src/basics.cpp.new 2011-01-23 19:33:49.499236864 +0000 +@@ -93,7 +93,7 @@ + std::cerr << "ASSERTION ERROR!" << std::endl; + std::cerr << "Filename: " << filename << std::endl; + std::cerr << "Line number: " << lineNumber << std::endl; +- ++/* + std::cerr << "Do you wish to continue?(y/n)"; + char y = 'a'; + while (y != 'n' && y != 'y') +@@ -101,6 +101,7 @@ + + if (y != 'y') + exit(1); ++*/ + } + + void dh_warn(const char * const filename, const unsigned int lineNumber,const char *message) diff --git a/3Depict-0.0.4-texture-path.patch b/3Depict-0.0.4-texture-path.patch new file mode 100644 index 0000000..6434461 --- /dev/null +++ b/3Depict-0.0.4-texture-path.patch @@ -0,0 +1,12 @@ +diff -r bf43078bcaed src/basics.h +--- src/basics.h Fri Nov 26 00:20:07 2010 +0000 ++++ src/basics.h Fri Nov 26 00:21:07 2010 +0000 +@@ -109,7 +109,7 @@ + + //Mac + // - Look in cwd +- return std::string(name); ++ return std::string("/usr/share/3Depict/") + std::string(name); + } + + template diff --git a/3Depict.spec b/3Depict.spec index b0d5737..14b83bb 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,5 +1,5 @@ Name: 3Depict -Version: 0.0.3 +Version: 0.0.4 Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -46,10 +46,12 @@ useful for general scalar valued point data purposes. %patch0 %build -#enable parallel build -export CFLAGS="$CFLAGS %{optflags} -fopenmp" -export CXXFLAGS+="$CXXFLAGS %{optflags} -fopenmp -DGLIBCXX_PARALLEL" -%configure +#--enable-openmp-parallel does not work -- there is a bug in the +# tr1 headers with -D_GLIBCXX_PARALLEL . Lets drop that and only use +# -fopenmp +export CFLAGS="$CFLAGS -fopenmp" +export CXXFLAGS="$CFLAGS -fopenmp" +%configure --enable-no-debug-checks make %{?_smp_mflags} pushd docs/manual-latex @@ -95,6 +97,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 22 2011 D Haley - 0.0.4-1 +- Update to 0.0.4 + * Fri Nov 26 2010 D Haley - 0.0.3-1 - Update to 0.0.3 diff --git a/sources b/sources index 8a52e08..90256e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5a6ae1c5d55aabb306467bae987dc64 3Depict-0.0.3.tar.gz +7775fad11781b5481328733256b4024e 3Depict-0.0.4.tar.gz