From 912eee53b2074aa7631c74e77f3ac2265bcb63f2 Mon Sep 17 00:00:00 2001 From: mycae Date: Dec 01 2013 18:42:47 +0000 Subject: * Update to 0.0.15 --- diff --git a/.gitignore b/.gitignore index a63fabb..299d159 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /3Depict-0.0.12.tar.gz /3Depict-0.0.13.tar.gz /3Depict-0.0.14.tar.gz +/3Depict-0.0.15.tar.gz diff --git a/3Depict-0.0.14-font-path.patch b/3Depict-0.0.14-font-path.patch deleted file mode 100644 index 9bd6c31..0000000 --- a/3Depict-0.0.14-font-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r 1b997a96b779 src/wxcomponents.cpp ---- src/wxcomponents.cpp Sat Mar 23 17:50:44 2013 +0000 -+++ src/wxcomponents.cpp Sat Mar 23 17:56:14 2013 +0000 -@@ -857,16 +857,17 @@ - //(Oh look Ma, I'm autoconf!) - - const char *dirs[] = { ".", -- "/usr/share/fonts/truetype", //Old debian -+ "/usr/local/share/fonts/truetype", // User fonts - "/usr/share/fonts/truetype/freefont", // New debian - "/usr/share/fonts/truetype/ttf-dejavu", //New debian -- "/usr/local/share/fonts/truetype", // User fonts -+ "/usr/share/fonts/truetype", //Old debian -+ "/usr/share/fonts/dejavu", //Fedora - "/usr/X11R6/lib/X11/fonts/truetype", - "/usr/X11R6/lib64/X11/fonts/truetype", -- "/usr/lib/X11/fonts/truetype",// Fedora 32 -- "/usr/lib64/X11/fonts/truetype", //Fedora 64 -- "/usr/local/lib/X11/fonts/truetype", // Fedora 32 new -- "/usr/local/lib64/X11/fonts/truetype",// Fedora 64 new -+ "/usr/lib/X11/fonts/truetype", -+ "/usr/lib64/X11/fonts/truetype", -+ "/usr/local/lib/X11/fonts/truetype", -+ "/usr/local/lib64/X11/fonts/truetype", - "", - }; //MUST end with "". - diff --git a/3Depict-0.0.14-manual-pdf-loc.patch b/3Depict-0.0.14-manual-pdf-loc.patch deleted file mode 100644 index 8eb261f..0000000 --- a/3Depict-0.0.14-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r 1b997a96b779 src/gui/mainFrame.cpp ---- src/gui/mainFrame.cpp Sat Mar 23 17:50:44 2013 +0000 -+++ src/gui/mainFrame.cpp Sat Mar 23 17:56:36 2013 +0000 -@@ -2546,9 +2546,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-0.0.15-font-path.patch b/3Depict-0.0.15-font-path.patch new file mode 100644 index 0000000..3c13891 --- /dev/null +++ b/3Depict-0.0.15-font-path.patch @@ -0,0 +1,27 @@ +diff -r 1b997a96b779 src/wxcomponents.cpp +--- src/wx/wxcomponents.cpp Sat Mar 23 17:50:44 2013 +0000 ++++ src/wx/wxcomponents.cpp Sat Mar 23 17:56:14 2013 +0000 +@@ -857,16 +857,17 @@ + //(Oh look Ma, I'm autoconf!) + + const char *dirs[] = { ".", +- "/usr/share/fonts/truetype", //Old debian ++ "/usr/local/share/fonts/truetype", // User fonts + "/usr/share/fonts/truetype/freefont", // New debian + "/usr/share/fonts/truetype/ttf-dejavu", //New debian +- "/usr/local/share/fonts/truetype", // User fonts ++ "/usr/share/fonts/truetype", //Old debian ++ "/usr/share/fonts/dejavu", //Fedora + "/usr/X11R6/lib/X11/fonts/truetype", + "/usr/X11R6/lib64/X11/fonts/truetype", +- "/usr/lib/X11/fonts/truetype",// Fedora 32 +- "/usr/lib64/X11/fonts/truetype", //Fedora 64 +- "/usr/local/lib/X11/fonts/truetype", // Fedora 32 new +- "/usr/local/lib64/X11/fonts/truetype",// Fedora 64 new ++ "/usr/lib/X11/fonts/truetype", ++ "/usr/lib64/X11/fonts/truetype", ++ "/usr/local/lib/X11/fonts/truetype", ++ "/usr/local/lib64/X11/fonts/truetype", + "", + }; //MUST end with "". + diff --git a/3Depict-0.0.15-manual-pdf-loc.patch b/3Depict-0.0.15-manual-pdf-loc.patch new file mode 100644 index 0000000..8eb261f --- /dev/null +++ b/3Depict-0.0.15-manual-pdf-loc.patch @@ -0,0 +1,16 @@ +diff -r 1b997a96b779 src/gui/mainFrame.cpp +--- src/gui/mainFrame.cpp Sat Mar 23 17:50:44 2013 +0000 ++++ src/gui/mainFrame.cpp Sat Mar 23 17:56:36 2013 +0000 +@@ -2546,9 +2546,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 884d0eb..cc9468f 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.14 -Release: 2%{?dist} +Version: 0.0.15 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -109,6 +109,9 @@ rm -rf %{buildroot} %changelog +* Sun Dec 01 2013 D Haley - 0.0.15-1 +- Update to 0.0.15 + * Fri Aug 02 2013 Fedora Release Engineering - 0.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild