[3Depict/f15/master] * Update to 0.0.5
mycae
mycae at fedoraproject.org
Sun Mar 27 17:48:36 UTC 2011
commit 2d9ed06e9de579580b94a268b0ead1a0e0359bd7
Author: mycae <mycae at yahoo.com>
Date: Sun Mar 27 18:43:37 2011 +0100
* Update to 0.0.5
3Depict-0.0.4-gl-startup.patch | 79 ------------------------
3Depict-0.0.4-no-debug-wait-for-cin.patch | 19 ------
3Depict-0.0.4-texture-path.patch | 12 ----
3Depict-0.0.5-manual-pdf-loc.patch | 16 +++++
3Depict-latex-error-and-htlatex-niceness.patch | 21 ++++++
3Depict.spec | 31 +++++----
sources | 2 +-
7 files changed, 55 insertions(+), 125 deletions(-)
---
diff --git a/3Depict-0.0.5-manual-pdf-loc.patch b/3Depict-0.0.5-manual-pdf-loc.patch
new file mode 100644
index 0000000..5d338be
--- /dev/null
+++ b/3Depict-0.0.5-manual-pdf-loc.patch
@@ -0,0 +1,16 @@
+diff -r dd964e5b7415 src/3Depict.cpp
+--- src/3Depict.cpp Sun Mar 27 18:36:46 2011 +0100
++++ src/3Depict.cpp Sun Mar 27 18:38:13 2011 +0100
+@@ -1894,9 +1894,9 @@
+ string s;
+ s=locateDataFile("3Depict-manual.pdf");
+
+- //Also debian makes us use the lowercase "D", so check there too.
+- if(!s.size())
+- s=locateDataFile("3depict-manual.pdf");
++ //Also Fedora has diff dir
++ if(!wxFileExists(wxStr(s)))
++ s="/usr/share/doc/3Depict-0.0.5/3Depict-0.0.5-manual.pdf";
+
+
+ //If we found it, use the default program associated with that data file
diff --git a/3Depict-latex-error-and-htlatex-niceness.patch b/3Depict-latex-error-and-htlatex-niceness.patch
new file mode 100644
index 0000000..465f405
--- /dev/null
+++ b/3Depict-latex-error-and-htlatex-niceness.patch
@@ -0,0 +1,21 @@
+diff -r fdd128a9a03e docs/manual-latex/manual.tex
+--- docs/manual-latex/manual.tex Sun Mar 27 18:01:56 2011 +1100
++++ docs/manual-latex/manual.tex Sun Mar 27 18:03:00 2011 +1100
+@@ -177,7 +177,7 @@
+ \item \textbf{Ctrl}: Pan camera
+ \item \textbf{Tab} : Swivel camera (Look about)
+ \item \textbf{Ctrl +Tab} (Windows \textbf{Ctrl+Alt}): Roll camera around viewport centre. Note that the rolling motion is controlled by the position of the mouse click.
+-\item \txtbf{Space/Shift+Space/Ctrl+Space} : Reset camera bounds and position to look along X,Y or Z axes respectively.
++\item \textbf{Space/Shift+Space/Ctrl+Space} : Reset camera bounds and position to look along X,Y or Z axes respectively.
+ \item \textbf{+/-} : Zoom in/out.
+
+ \end{itemize}
+@@ -420,7 +420,7 @@
+ Parameter Description:
+ \begin{itemize}
+ \item \textbf{Core classification distance} : This distance is the maximum distance between which items initially marked ``core'' by their value can be separated from another core point (up to Core kNN Max) in order to not be discounted in the clustering. This aids in removing isolated points that are initially marked as core. This option is disabled if the value is set to 0.
+- \item \textbf{Core kNN max} : The Core k$^\mathrm{th}$ nearest neighbour maximum for core classification. This modifies the core classification stage, only looking up to some max kNN (unclassified core only) for other core points
++ \item \textbf{Core kNN max} : The Core k-th nearest neighbour maximum for core classification. This modifies the core classification stage, only looking up to some max kNN (unclassified core only) for other core points
+ \end{itemize}
+
+ Algorithm Description; each of these is conducted in sequence to generate the final clustered output.
diff --git a/3Depict.spec b/3Depict.spec
index 0e74639..ab5ad77 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,6 +1,6 @@
Name: 3Depict
-Version: 0.0.4
-Release: 4%{?dist}
+Version: 0.0.5
+Release: 1%{?dist}
Summary: Valued 3D point cloud visualization and analysis
Group: Applications/Engineering
@@ -11,11 +11,6 @@ Source0: http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Fedora specific texture path install location
-Patch0: %{name}-%{version}-texture-path.patch
-#Fix bug for opengl startup crash on initalisiation fail
-Patch1: %{name}-%{version}-gl-startup.patch
-
#Mathgl for plotting
BuildRequires: mathgl-devel
#Mesa for GLU
@@ -36,6 +31,10 @@ BuildRequires: tex(latex)
#Required for surface removal algorithms
BuildRequires: qhull-devel
+#Error in latex file, and htlatex dislikes the $^{}$ notation.
+Patch0: 3Depict-latex-error-and-htlatex-niceness.patch
+#Fedora specific PDF dir.
+Patch1: 3Depict-0.0.5-manual-pdf-loc.patch
%description
This program is designed to help users visualize and analyze 3D point clouds
@@ -44,7 +43,9 @@ specifically targeted to atom probe tomography applications, but may be
useful for general scalar valued point data purposes.
%prep
+
%setup -q
+
%patch0
%patch1
@@ -54,11 +55,13 @@ useful for general scalar valued point data purposes.
# -fopenmp
export CFLAGS="$RPM_OPT_FLAGS -fopenmp"
export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp"
-%configure --enable-no-debug-checks
+%configure --disable-debug-checks
make %{?_smp_mflags}
pushd docs/manual-latex
pdflatex manual.tex
+bibtex manual
+pdflatex manual.tex
popd
@@ -100,14 +103,14 @@ rm -rf %{buildroot}
%changelog
-* Sat Mar 13 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-4
-- Patch opengl startup code -- peek at gl context. Possible fix for bug 684390
+* Mon Mar 27 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.5-1
+- New upstream release
-* Sat Feb 12 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-3
-- Fix bug 677016
+* Sat Mar 13 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-3
+- Patch opengl startup code -- peek at gl context. Possible fix for bug 684390
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sat Feb 12 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-2
+- Fix bug 677016 - 3Depict no built with rpm opt flags
* Sat Jan 22 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.4-1
- Update to 0.0.4
diff --git a/sources b/sources
index 90256e7..9c5d02d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7775fad11781b5481328733256b4024e 3Depict-0.0.4.tar.gz
+559850366bd607f11535a5a6efb89c2b 3Depict-0.0.5.tar.gz
More information about the scm-commits
mailing list