From b2c65c4d7f1bb8b281127353a23ef96c4ccc286e Mon Sep 17 00:00:00 2001 From: D Haley Date: Apr 12 2013 21:32:42 +0000 Subject: Update to 0.0.13 --- diff --git a/3Depict-0.0.12-font-path.patch b/3Depict-0.0.12-font-path.patch deleted file mode 100644 index 70252ee..0000000 --- a/3Depict-0.0.12-font-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 -@@ -666,6 +666,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.12-manual-pdf-loc.patch b/3Depict-0.0.12-manual-pdf-loc.patch deleted file mode 100644 index a819a9c..0000000 --- a/3Depict-0.0.12-manual-pdf-loc.patch +++ /dev/null @@ -1,16 +0,0 @@ -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-0.0.12-release-fixes.patch b/3Depict-0.0.12-release-fixes.patch deleted file mode 100644 index 89199f8..0000000 --- a/3Depict-0.0.12-release-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -r 53afe9a60fab -r 7bb4ba49dcb4 src/3Depict.cpp ---- src/3Depict.cpp Sat Nov 24 23:55:24 2012 +0100 -+++ src/3Depict.cpp Sun Dec 09 18:27:00 2012 +0100 -@@ -1772,7 +1772,7 @@ - - - -- panelSpectra->limitInteraction(!locking); -+ panelSpectra->limitInteraction(locking); - break; - } - default: -@@ -2071,6 +2071,9 @@ - setLockUI(false); - panelTop->Enable(true); - -+ //Re-run the scene update for the original case, -+ // this allow sfor things like the selection bindings to be reinitialised. -+ doSceneUpdate(); - } - - void MainWindowFrame::OnFileExportPackage(wxCommandEvent &event) -diff -r 53afe9a60fab -r 7bb4ba49dcb4 src/mathglPane.cpp ---- src/mathglPane.cpp Sat Nov 24 23:55:24 2012 +0100 -+++ src/mathglPane.cpp Sun Dec 09 18:27:00 2012 +0100 -@@ -611,7 +611,7 @@ - - void MathGLPane::leftMouseDown(wxMouseEvent& event) - { -- if(!gr || !thePlot->getNumVisible() || !thePlot->isInteractionLocked()) -+ if(!gr || !thePlot->getNumVisible() || thePlot->isInteractionLocked()) - return; - - int w,h; diff --git a/3Depict.spec b/3Depict.spec index 23db2bf..5c93838 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,6 +1,6 @@ Name: 3Depict -Version: 0.0.12 -Release: 2%{?dist} +Version: 0.0.13 +Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -36,8 +36,6 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch -#Upstream patch for 0.0.12 release bugs -Patch2: %{name}-0.0.12-release-fixes.patch %description This software is designed to help users visualize and analyze 3D point clouds @@ -51,7 +49,6 @@ useful for general scalar valued point data purposes. %patch0 %patch1 -%patch2 %build %configure --disable-debug-checks --enable-openmp-parallel @@ -63,7 +60,7 @@ make install DESTDIR=%{buildroot} # Install the textures mkdir -p %{buildroot}%{_datadir}/%{name}/textures -cp -p src/textures/* %{buildroot}%{_datadir}/%{name}/textures +cp -p data/textures/*png %{buildroot}%{_datadir}/%{name}/textures/ #Install the manpage @@ -73,7 +70,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 data/textures/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg #install language files #-- @@ -112,6 +109,15 @@ rm -rf %{buildroot} %changelog +* Sun Mar 23 2013 D Haley - 0.0.13-1 +- Update to 0.0.13 + +* Sun Mar 23 2013 D Haley - 0.0.12-4 +- Add aarch 64 patch for bug 924960, until next version + +* Wed Feb 13 2013 Fedora Release Engineering - 0.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Dec 9 2012 D Haley - 0.0.12-2 - Import bugfixes from upstream for plot UI and crash fixes @@ -130,7 +136,7 @@ rm -rf %{buildroot} * Thu Jan 12 2012 Fedora Release Engineering - 0.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Sat Dec 20 2011 D Haley - 0.0.9-1 +* Sat Dec 17 2011 D Haley - 0.0.9-1 - Update to 0.0.9 * Tue Dec 06 2011 Adam Jackson - 0.0.8-3 @@ -145,13 +151,13 @@ rm -rf %{buildroot} * Sun Aug 14 2011 D Haley - 0.0.7-1 - Update to 0.0.7 -* Sun May 20 2011 D Haley - 0.0.6-1 +* 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 +* Sun Mar 27 2011 D Haley - 0.0.5-1 - New upstream release -* Sat Mar 13 2011 D Haley - 0.0.4-3 +* Sun Mar 13 2011 D Haley - 0.0.4-3 - Patch opengl startup code -- peek at gl context. Possible fix for bug 684390 * Sat Feb 12 2011 D Haley - 0.0.4-2 @@ -173,5 +179,5 @@ rm -rf %{buildroot} - Update to 0.0.2 - Address comments in package review -* Sat Aug 08 2010 D Haley - 0.0.1-1 +* Sun Aug 08 2010 D Haley - 0.0.1-1 - Initial package diff --git a/sources b/sources index ef31ff4..5fbd141 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb97ab7e9d64030f3e3050370fa841c9 3Depict-0.0.12.tar.gz +b992d96a59bd45e9cacfbeec6fd9d043 3Depict-0.0.13.tar.gz