diff --git a/3Depict-0.0.5-manual-pdf-loc.patch b/3Depict-0.0.5-manual-pdf-loc.patch deleted file mode 100644 index 5d338be..0000000 --- a/3Depict-0.0.5-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -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-0.0.6-font-path.patch b/3Depict-0.0.6-font-path.patch new file mode 100644 index 0000000..33b4705 --- /dev/null +++ b/3Depict-0.0.6-font-path.patch @@ -0,0 +1,11 @@ +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 @@ + //This is a list of possible target dirs to search + //(Oh look Ma, I'm autoconf!) + const char *dirs[] = { ".", ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/share/fonts/truetype", + "/usr/local/share/fonts/truetype", + "/usr/X11R6/lib/X11/fonts/truetype", diff --git a/3Depict-0.0.6-manual-pdf-loc.patch b/3Depict-0.0.6-manual-pdf-loc.patch new file mode 100644 index 0000000..5d338be --- /dev/null +++ b/3Depict-0.0.6-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.spec b/3Depict.spec index ab5ad77..f434194 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,5 +1,5 @@ Name: 3Depict -Version: 0.0.5 +Version: 0.0.6 Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -31,10 +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 +Patch0: 3Depict-0.0.6-manual-pdf-loc.patch +#Fedora specific font dir +Patch1: 3Depict-0.0.6-font-path.patch %description This program is designed to help users visualize and analyze 3D point clouds @@ -103,6 +103,9 @@ rm -rf %{buildroot} %changelog +* Fri May 20 2011 D Haley - 0.0.6-1 +- Update to 0.0.6 + * Mon Mar 27 2011 D Haley - 0.0.5-1 - New upstream release diff --git a/sources b/sources index 9c5d02d..d4af7bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -559850366bd607f11535a5a6efb89c2b 3Depict-0.0.5.tar.gz +a26b0011a0bc483ecde022f0f4e6870d 3Depict-0.0.6.tar.gz