[3Depict/f16] * Update to 0.0.9

[mycae]

commit 382e4c082c9e38ce3ad39b8556eaf2693cc7ab57
Author: D Haley <nospammycae at yahoo.com>
Date:   Sun Dec 18 18:32:23 2011 +0000

    * Update to 0.0.9

 3Depict-0.0.8-manual-latex.patch                   |   28 ----
 3Depict-0.0.8-post-rel-fixes.patch                 |  131 --------------------
 ...ont-path.patch => 3Depict-0.0.9-font-path.patch |    0
 ...loc.patch => 3Depict-0.0.9-manual-pdf-loc.patch |    0
 3Depict-0.0.9-png-gray.patch                       |   15 +++
 3Depict.spec                                       |   43 ++++---
 sources                                            |    2 +-
 7 files changed, 38 insertions(+), 181 deletions(-)
---
diff --git a/3Depict-0.0.8-font-path.patch b/3Depict-0.0.9-font-path.patch
similarity index 100%
rename from 3Depict-0.0.8-font-path.patch
rename to 3Depict-0.0.9-font-path.patch
diff --git a/3Depict-0.0.8-manual-pdf-loc.patch b/3Depict-0.0.9-manual-pdf-loc.patch
similarity index 100%
rename from 3Depict-0.0.8-manual-pdf-loc.patch
rename to 3Depict-0.0.9-manual-pdf-loc.patch
diff --git a/3Depict-0.0.9-png-gray.patch b/3Depict-0.0.9-png-gray.patch
new file mode 100644
index 0000000..5c0e793
--- /dev/null
+++ b/3Depict-0.0.9-png-gray.patch
@@ -0,0 +1,15 @@
+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 64f6ee8..fac06d3 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -1,6 +1,6 @@
 Name:		3Depict
-Version:	0.0.8
-Release:	2%{?dist}
+Version:	0.0.9
+Release:	1%{?dist}
 Summary:	Valued 3D point cloud visualization and analysis
 Group:		Applications/Engineering
 
@@ -33,16 +33,12 @@ BuildRequires: tex(latex)
 BuildRequires: qhull-devel
 
 #Fedora specific PDF dir.
-Patch0: %{name}-0.0.8-manual-pdf-loc.patch
+Patch0: %{name}-0.0.9-manual-pdf-loc.patch
 #Fedora specific font dir
-Patch1: %{name}-0.0.8-font-path.patch
-
-#Fix latex manual version # and syntax
-Patch2: %{name}-0.0.8-manual-latex.patch
-
-#Fix bugs identified post 0.0.8 release
-Patch3: %{name}-0.0.8-post-rel-fixes.patch
-
+Patch1: %{name}-0.0.9-font-path.patch
+#Patch for libpng 1.4.0 removing png_set_gray_1_2_4_to_8
+#libpng.sourceforge.net/ANNOUNCE-1.4.0.txt
+Patch2: %{name}-0.0.9-png-gray.patch
 %description
 This program is designed to help users visualize and analyze 3D point clouds
 with an associated real value, in a fast and flexible fashion. It is 
@@ -56,15 +52,14 @@ useful for general scalar valued point data purposes.
 %patch0
 %patch1
 %patch2
-%patch3
+
+#Fix permissions erorrs in tarball
+chmod a-x src/*.cpp src/*.h
 
 %build
-#--enable-openmp-parallel does not work -- there is a bug in the
-# tr1 headers with -D_GLIBCXX_PARALLEL . Lets drop that and only use
-# -fopenmp
-export CFLAGS="$RPM_OPT_FLAGS -fopenmp"
-export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp"
-%configure --disable-debug-checks
+#export CFLAGS="$RPM_OPT_FLAGS -fopenmp"
+#export CXXFLAGS="$RPM_OPT_FLAGS -fopenmp"
+%configure --disable-debug-checks --enable-openmp-parallel
 make %{?_smp_mflags}
 
 pushd docs/manual-latex
@@ -80,7 +75,7 @@ make install DESTDIR=%{buildroot}
 
 # Install the textures
 mkdir -p %{buildroot}%{_datadir}/%{name}/textures
-cp -p src/textures/textures/* %{buildroot}%{_datadir}/%{name}/textures
+cp -p src/textures/* %{buildroot}%{_datadir}/%{name}/textures
 
 
 #Install the manpage
@@ -90,7 +85,7 @@ desktop-file-install \
 		--dir %{buildroot}%{_datadir}/applications \
 		packaging/%{name}.desktop
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
-install -Dp -m 644 src/tex-source/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
+install -Dp -m 644 src/tex-source/%{name}-icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
 
 #install language files
 #--
@@ -100,7 +95,7 @@ mv locales/de_DE/ locales/de/
 mkdir -p %{buildroot}/%{_datadir}/locale/
 cp -R locales/* %{buildroot}/%{_datadir}/locale/
 
-#Restore the internal build's locale namign
+#Restore the internal build's locale naming
 mv locales/de/ locales/de_DE/
 #--
 
@@ -129,6 +124,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 06 2011 Adam Jackson <mycae(a!t)yahoo.com> - 0.0.9-1
+- Rebuild for new libpng
+
+* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.0.8-3
+- Rebuild for new libpng
+
 * Sat Oct 29 2011 D Haley <mycae(a!t)yahoo.com> - 0.0.8-2
 - Post release fixes for various crash bugs
 
diff --git a/sources b/sources
index 8dd6c27..2959acd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-832740cc7bf7cc89cd94dbf082532584  3Depict-0.0.8.tar.gz
+9be57d2690cfe81398362f371fc681e3  3Depict-0.0.9.tar.gz