[3Depict/f14] * Update to 0.0.8
mycae
mycae at fedoraproject.org
Sun Oct 23 17:09:17 UTC 2011
commit d25b276962108cef0fe3478c9e8c98d94eb508bf
Author: mycae <mycae(atime)yahoo.com>
Date: Sun Oct 23 18:08:52 2011 +0100
* Update to 0.0.8
3Depict-0.0.6-manual-pdf-loc.patch | 16 -
...ont-path.patch => 3Depict-0.0.8-font-path.patch | 2 +-
3Depict-0.0.8-manual-latex.patch | 28 +
3Depict-0.0.8-manual-pdf-loc.patch | 16 +
3Depict-blockmask-fix.patch | 30 -
3Depict-density-fix.patch | 47 -
3Depict-wrong-icon.patch | 1171 --------------------
3Depict.spec | 24 +-
8 files changed, 55 insertions(+), 1279 deletions(-)
---
diff --git a/3Depict-0.0.6-font-path.patch b/3Depict-0.0.8-font-path.patch
similarity index 95%
rename from 3Depict-0.0.6-font-path.patch
rename to 3Depict-0.0.8-font-path.patch
index 33b4705..70252ee 100644
--- a/3Depict-0.0.6-font-path.patch
+++ b/3Depict-0.0.8-font-path.patch
@@ -1,7 +1,7 @@
diff -r dfc04b8b14b2 src/wxcomponents.cpp
--- src/wxcomponents.cpp Fri May 20 22:26:38 2011 +0100
+++ src/wxcomponents.cpp Fri May 20 22:27:00 2011 +0100
-@@ -660,6 +660,7 @@
+@@ -666,6 +666,7 @@
//This is a list of possible target dirs to search
//(Oh look Ma, I'm autoconf!)
const char *dirs[] = { ".",
diff --git a/3Depict-0.0.8-manual-latex.patch b/3Depict-0.0.8-manual-latex.patch
new file mode 100644
index 0000000..423bfb2
--- /dev/null
+++ b/3Depict-0.0.8-manual-latex.patch
@@ -0,0 +1,28 @@
+Index: 3depict-0.0.8/docs/manual-latex/manual.tex
+===================================================================
+--- docs/manual-latex/manual.tex 2011-10-23 16:57:40.000000000 +0100
++++ docs/manual-latex/manual.tex 2011-10-23 16:57:59.000000000 +0100
+@@ -40,7 +40,7 @@
+ \begin{minipage}{0.3\textwidth}
+ \begin{flushright} \large
+ \emph{Version:} \\
+- 0.0.7, Jul 2011\end{flushright}
++ 0.0.8, Oct 2011\end{flushright}
+ \end{minipage}
+
+ \vfill
+@@ -499,12 +499,13 @@
+ \item \textbf{Reflexive} If selected, the reflexive (exterior) angle will be displayed, rather than the interior angle for the angular measurement.
+ \item \textbf{Show Angle} Will display the angle measured by the marker in the 3D scene, if selected.
+ \item \textbf{Text Size} Controls the text size for the angle measurement, if the angle is shown.
+-\item \textbf{Digit format} Controls the number of significant digits to use, such as '##.##', which will show (for example), 10.78 as the degree value. Use #, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,).
++\item \textbf{Digit format} Controls the number of significant digits to use, such as '\#\#.\#\#', which will show (for example), 10.78 as the degree value. Use \#, or 0-9 as placeholders to specify the format.Allowable decimal separators are period (.) and comma (,).
+
+ \item \textbf{Sphere size} Sets the size of the sphere widgets which are used to maniupulate and draw the angular measurement positions.
+ \end{itemize}
+ \section{Attributions}
+
++\begin{itemize}
+ \item The source code image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:User_icon_2.svg} and \url{http://commons.wikimedia.org/wiki/C_cplusplus_compilation_process.svg}.
+
+ \item The camera image is a derivative work of \url{http://commons.wikimedia.org/wiki/File:Icon_Camera.svg}.
diff --git a/3Depict-0.0.8-manual-pdf-loc.patch b/3Depict-0.0.8-manual-pdf-loc.patch
new file mode 100644
index 0000000..a819a9c
--- /dev/null
+++ b/3Depict-0.0.8-manual-pdf-loc.patch
@@ -0,0 +1,16 @@
+diff -r 634db475333f src/3Depict.cpp
+--- src/3Depict.cpp Sun Oct 23 17:43:37 2011 +0100
++++ src/3Depict.cpp Sun Oct 23 17:44:33 2011 +0100
+@@ -2142,9 +2142,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.8/3Depict-0.0.8-manual.pdf";
+
+
+ //If we found it, use the default program associated with that data file
diff --git a/3Depict.spec b/3Depict.spec
index fcbc7f6..eca9131 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,5 +1,5 @@
Name: 3Depict
-Version: 0.0.7
+Version: 0.0.8
Release: 1%{?dist}
Summary: Valued 3D point cloud visualization and analysis
Group: Applications/Engineering
@@ -33,18 +33,13 @@ BuildRequires: tex(latex)
BuildRequires: qhull-devel
#Fedora specific PDF dir.
-Patch0: %{name}-0.0.6-manual-pdf-loc.patch
+Patch0: %{name}-0.0.8-manual-pdf-loc.patch
#Fedora specific font dir
-Patch1: %{name}-0.0.6-font-path.patch
+Patch1: %{name}-0.0.8-font-path.patch
-#Fix for density plot mishandling in program (upstream)
-Patch2: %{name}-density-fix.patch
+#Fix latex manual version # and syntax
+Patch2: %{name}-0.0.8-manual-latex.patch
-#Fix for refresh tree blockmask mishandle (upstream)
-Patch3: %{name}-blockmask-fix.patch
-
-#Fix for wrong icon
-Patch4: %{name}-wrong-icon.patch
%description
This program is designed to help users visualize and analyze 3D point clouds
with an associated real value, in a fast and flexible fashion. It is
@@ -58,8 +53,6 @@ useful for general scalar valued point data purposes.
%patch0
%patch1
%patch2
-%patch3
-%patch4
%build
#--enable-openmp-parallel does not work -- there is a bug in the
@@ -83,7 +76,7 @@ make install DESTDIR=%{buildroot}
# Install the textures
mkdir -p %{buildroot}%{_datadir}/%{name}/textures
-cp -p src/textures/* %{buildroot}%{_datadir}/%{name}/textures
+cp -p src/textures/textures/* %{buildroot}%{_datadir}/%{name}/textures
#Install the manpage
@@ -93,7 +86,7 @@ desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
packaging/%{name}.desktop
mkdir -p %{buildroot}%{_datadir}/pixmaps/
-install -Dp -m 644 src/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
+install -Dp -m 644 src/tex-source/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
#install language files
#--
@@ -132,6 +125,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Oct 23 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.8-1
+- Update to 0.0.8
+
* Sun Aug 14 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.7-1
- Update to 0.0.7
More information about the scm-commits
mailing list