From b178972dd2d869c0d14606b033a300e13b3bf5a4 Mon Sep 17 00:00:00 2001
From: Ralf Corsépius <corsepiu@fedoraproject.org>
Date: Feb 10 2011 13:49:52 +0000
Subject: - Upstream update (contains boost-compatibility fixes).

- Add k3d-0.8.0.2-gcc-4.6.diff (Work around g++ mutable changes).
- Add k3d-0.8.0.2-cmake.diff (Work around cmake not getting libdir right).
- Reflect upstream having switched to using versoned libs.

---

diff --git a/.gitignore b/.gitignore
index 9014b3f..170e0f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 k3d-source-0.8.0.1.tar.bz2
+/k3d-source-0.8.0.2.tar.bz2
diff --git a/k3d-0.8.0.2-cmake.diff b/k3d-0.8.0.2-cmake.diff
new file mode 100644
index 0000000..3e1665c
--- /dev/null
+++ b/k3d-0.8.0.2-cmake.diff
@@ -0,0 +1,12 @@
+--- k3d-source-0.8.0.2.orig/CMakeLists.txt	2010-07-03 04:27:53.000000000 +0200
++++ k3d-source-0.8.0.2/CMakeLists.txt	2011-02-10 10:28:23.236698104 +0100
+@@ -326,7 +326,8 @@
+ # Setup output directories ...
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
+ 
+-SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
++# SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
++SET(K3D_LIBDIR lib${LIB_SUFFIX}) 
+ IF(WIN32)
+ 	SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
+ ELSE(WIN32)
diff --git a/k3d-0.8.0.2-gcc-4.6.diff b/k3d-0.8.0.2-gcc-4.6.diff
new file mode 100644
index 0000000..a82efd4
--- /dev/null
+++ b/k3d-0.8.0.2-gcc-4.6.diff
@@ -0,0 +1,21 @@
+diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp
+--- k3d-source-0.8.0.2.orig/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp	2010-07-03 04:27:47.000000000 +0200
++++ k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp	2011-02-10 07:42:05.369909078 +0100
+@@ -114,7 +114,7 @@
+     template <typename T2, typename Op>
+     struct reduce_bind1 {
+         const T2& _t2;
+-        mutable Op&  _op;
++        Op&  _op;
+ 
+         typedef typename Op::result_type result_type;
+ 
+@@ -127,7 +127,7 @@
+     struct reduce_bind2 {
+         const Bits1& _bits1;
+         std::size_t _index1;
+-        mutable Op&  _op;
++        Op&  _op;
+ 
+         typedef typename Op::result_type result_type;
+ 
diff --git a/k3d.spec b/k3d.spec
index b867dc2..9def040 100644
--- a/k3d.spec
+++ b/k3d.spec
@@ -1,6 +1,6 @@
 Name:           k3d
-Version:        0.8.0.1
-Release:        3%{?dist}
+Version:        0.8.0.2
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -8,6 +8,9 @@ License:        GPLv2+
 URL:            http://www.k-3d.org/
 Source0:        http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.bz2
 Source1:        k3d.desktop
+Patch0:         k3d-0.8.0.2-gcc-4.6.diff
+Patch1:         k3d-0.8.0.2-cmake.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This list is alpha sorted.
@@ -86,8 +89,12 @@ rendering a model written by K-3D.
 
 %prep
 %setup -q -n k3d-source-%{version}
+%patch0 -p1
+%patch1 -p1
+
+# binaries in source tarball
+rm tests/*.pyc
 
-rm -f CMakeCache.txt
 find . \( -type f -a -executable \) -exec chmod -x "{}" \;
 
 sed -i -e "s,\${k3d_BINARY_DIR}/lib,\${k3d_BINARY_DIR}/%{_lib}," k3dsdk/ftgl/CMakeLists.txt
@@ -146,7 +153,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/k3d*
 %dir %{_libdir}/k3d
 %{_libdir}/k3d/plugins
-%{_libdir}/*.so
+%{_libdir}/*.so.*
 %dir %{_datadir}/k3d
 %{_datadir}/k3d/*.k3d
 %{_datadir}/k3d/documents
@@ -173,10 +180,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %defattr(-, root, root, -)
 %{_includedir}/k3d
 %{_libdir}/k3d/include
+%{_libdir}/*.so
 %{_datadir}/k3d/shaders/*.h
 
 
 %changelog
+* Thu Feb 10 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.8.0.2-1
+- Upstream update (contains boost-compatibility fixes).
+- Add k3d-0.8.0.2-gcc-4.6.diff (Work around g++ mutable changes).
+- Add k3d-0.8.0.2-cmake.diff (Work around cmake not getting libdir right).
+- Reflect upstream having switched to using versoned libs.
+
 * Tue Sep 16 2010 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.8.0.1-3
 - Rebuilt for libImageMagick.so.4.
 
diff --git a/sources b/sources
index 44046d6..7957eda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88027c4d43583df2496c25576d0f31b6  k3d-source-0.8.0.1.tar.bz2
+9f4808b8d5e324f69b72ef1950df45d7  k3d-source-0.8.0.2.tar.bz2