From 3301a79eb7c24c05308a5026e204e91f1a0a25a7 Mon Sep 17 00:00:00 2001 From: D Haley Date: Nov 25 2012 02:57:18 +0000 Subject: * Remove old patches, update spec --- diff --git a/3Depict-0.0.11-font-path.patch b/3Depict-0.0.11-font-path.patch deleted file mode 100644 index 70252ee..0000000 --- a/3Depict-0.0.11-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.11-manual-pdf-loc.patch b/3Depict-0.0.11-manual-pdf-loc.patch deleted file mode 100644 index a819a9c..0000000 --- a/3Depict-0.0.11-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.11-png-gray.patch b/3Depict-0.0.11-png-gray.patch deleted file mode 100644 index 5c0e793..0000000 --- a/3Depict-0.0.11-png-gray.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r src/pngread.c src/pngread.c ---- src/pngread.c -+++ src/pngread.c -@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { --#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) - png_set_expand_gray_1_2_4_to_8(png_ptr); --#else -- png_set_gray_1_2_4_to_8(png_ptr); --#endif - } - - /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/3Depict-0.0.12-png-gray.patch b/3Depict-0.0.12-png-gray.patch deleted file mode 100644 index 5c0e793..0000000 --- a/3Depict-0.0.12-png-gray.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r src/pngread.c src/pngread.c ---- src/pngread.c -+++ src/pngread.c -@@ -132,11 +132,7 @@ int read_png(FILE *fp, unsigned int sig_read, png_bytep **row_pointers, - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { --#if defined(__APPLE__) || defined(__WIN32) || defined(__WIN64) - png_set_expand_gray_1_2_4_to_8(png_ptr); --#else -- png_set_gray_1_2_4_to_8(png_ptr); --#endif - } - - /* Expand paletted or RGB images with transparency to full alpha for RGBA */ diff --git a/3Depict.spec b/3Depict.spec index e9c5245..82d7f6b 100644 --- a/3Depict.spec +++ b/3Depict.spec @@ -1,5 +1,5 @@ Name: 3Depict -Version: 0.0.11 +Version: 0.0.12 Release: 1%{?dist} Summary: Valued 3D point cloud visualization and analysis Group: Applications/Engineering @@ -27,7 +27,7 @@ BuildRequires: desktop-file-utils #WX widgets BuildRequires: wxGTK-devel #PDF latex build -BuildRequires: tex(latex) +#BuildRequires: tex(latex) #Required for surface removal algorithms BuildRequires: qhull-devel @@ -36,8 +36,7 @@ BuildRequires: qhull-devel Patch0: %{name}-%{version}-manual-pdf-loc.patch #Fedora specific font dir Patch1: %{name}-%{version}-font-path.patch -#PNG API change patch -Patch2: %{name}-%{version}-png-gray.patch + %description This software is designed to help users visualize and analyze 3D point clouds with an associated real value, in a fast and flexible fashion. It is @@ -50,19 +49,11 @@ useful for general scalar valued point data purposes. %patch0 %patch1 -%patch2 %build %configure --disable-debug-checks --enable-openmp-parallel make %{?_smp_mflags} -pushd docs/manual-latex -pdflatex manual.tex -bibtex manual -pdflatex manual.tex -popd - - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} @@ -118,16 +109,10 @@ rm -rf %{buildroot} %changelog -* Wed Jul 18 2012 D Haley - 0.0.11-1 -- Update to 0.0.11 - -* Wed Jul 18 2012 Fedora Release Engineering - 0.0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 6 2012 D Haley - 0.0.10-2 -- Add post-release patch from upstream mercurial (http://threedepict.hg.sourceforge.net/hgweb/threedepict/threedepict/rev/4583c3a39b82) +* Sun Nov 25 2012 D Haley - 0.0.12-1 +- Update to 0.0.12 -* Sun Apr 1 2012 D Haley - 0.0.10-1 +* Mon Apr 2 2012 D Haley - 0.0.10-1 - Update to 0.0.10 * Tue Feb 28 2012 Fedora Release Engineering - 0.0.9-4