From 565726a833e428e94ed2cf1c206da9def30c6f94 Mon Sep 17 00:00:00 2001 From: D Haley Date: Apr 05 2019 23:44:19 +0000 Subject: * Update to 0.0.22 --- diff --git a/.gitignore b/.gitignore index f53c1de..641651a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /3Depict-0.0.19.tar.gz /3Depict-0.0.20.tar.gz /3Depict-0.0.21.tar.gz +/3Depict-0.0.22.tar.gz diff --git a/3Depict-0.0.21-font-path.patch b/3Depict-0.0.21-font-path.patch deleted file mode 100644 index 9a52b58..0000000 --- a/3Depict-0.0.21-font-path.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/wx/wxcomponents.cpp -+++ src/wx/wxcomponents.cpp -@@ -555,16 +555,17 @@ std::string TTFFinder::nxFindFont(const char *fontFile) - //(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.21-manual-pdf-loc.patch b/3Depict-0.0.21-manual-pdf-loc.patch deleted file mode 100644 index b2d23c4..0000000 --- a/3Depict-0.0.21-manual-pdf-loc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/gui/mainFrame.cpp -+++ src/gui/mainFrame.cpp -@@ -2904,9 +2904,9 @@ void MainWindowFrame::OnHelpHelp(wxCommandEvent &event) - 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(s)) -+ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; - - //FIXME: under windows, currently we use "manual.pdf" - if(!s.size()) diff --git a/3Depict-0.0.21-qhull.patch b/3Depict-0.0.21-qhull.patch deleted file mode 100644 index 835831b..0000000 --- a/3Depict-0.0.21-qhull.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h ---- src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:27:02 2018 +0000 -+++ src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:34:47 2018 +0000 -@@ -35,7 +35,7 @@ - #endif - extern "C" - { -- #include -+ #include - } - #ifdef __POWERPC__ - #pragma pop_macro("__POWERPC__") diff --git a/3Depict-0.0.22-font-path.patch b/3Depict-0.0.22-font-path.patch new file mode 100644 index 0000000..9a52b58 --- /dev/null +++ b/3Depict-0.0.22-font-path.patch @@ -0,0 +1,26 @@ +--- src/wx/wxcomponents.cpp ++++ src/wx/wxcomponents.cpp +@@ -555,16 +555,17 @@ std::string TTFFinder::nxFindFont(const char *fontFile) + //(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.22-manual-pdf-loc.patch b/3Depict-0.0.22-manual-pdf-loc.patch new file mode 100644 index 0000000..b2d23c4 --- /dev/null +++ b/3Depict-0.0.22-manual-pdf-loc.patch @@ -0,0 +1,15 @@ +--- src/gui/mainFrame.cpp ++++ src/gui/mainFrame.cpp +@@ -2904,9 +2904,9 @@ void MainWindowFrame::OnHelpHelp(wxCommandEvent &event) + 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(s)) ++ s="/usr/share/doc/3Depict-0.0.8/3Depict-0.0.8-manual.pdf"; + + //FIXME: under windows, currently we use "manual.pdf" + if(!s.size()) diff --git a/3Depict-0.0.22-qhull.patch b/3Depict-0.0.22-qhull.patch new file mode 100644 index 0000000..835831b --- /dev/null +++ b/3Depict-0.0.22-qhull.patch @@ -0,0 +1,12 @@ +diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h +--- src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:27:02 2018 +0000 ++++ src/backend/filters/algorithms/convexHull.h Sun Feb 11 00:34:47 2018 +0000 +@@ -35,7 +35,7 @@ + #endif + extern "C" + { +- #include ++ #include + } + #ifdef __POWERPC__ + #pragma pop_macro("__POWERPC__") diff --git a/3Depict.spec b/3Depict.spec index c5c72ab..4612452 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.21 -Release: 3%{?dist} +Version: 0.0.22 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis @@ -107,7 +107,7 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog README TODO %{name}-%{version}-manual.pdf +%doc ChangeLog.txt README %{name}-%{version}-manual.pdf %{_bindir}/%{name} %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/textures @@ -118,6 +118,9 @@ mv docs/manual-latex/manual.pdf %{name}-%{version}-manual.pdf %changelog +* Fri Apr 05 2019 D Haley - 0.0.22-1 +- Update to 0.0.22 + * Thu Jan 31 2019 Fedora Release Engineering - 0.0.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index cac1c82..2ef54ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3Depict-0.0.21.tar.gz) = 7f9ed4813675c7977df9fd5cc83af3c03e2c91f8d724ebe497d120bd5db0b25843bfdb8d01d495be08f86ed63117755f87be9a81bb4c6b48246c9b7144dec984 +SHA512 (3Depict-0.0.22.tar.gz) = 41659b44b089aa61e0d517bacc4a4509cac3ba2d168bdd952d29e4b1f296f8ba97e547482a12da0a0c6936e37fc8421428baa9c4eb1dc82527635802944ab47c