[LuxRender/f18] Update to 1.0

[Nicolas Chauvet]

commit 9d56c7cbf7c48bb557f4722cdc09af2a09bdd5d3
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Oct 4 00:34:00 2012 +0200

    Update to 1.0

 .gitignore                                       |    3 ++
 LuxRender.spec                                   |   24 +++++++++++----------
 luxrays-1.0_rc1-ld.patch => luxrays-1.0-ld.patch |    6 ++--
 luxrays-1.0_rc3-ld.patch                         |   11 ----------
 sources                                          |    6 ++--
 5 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d81f1eb..707c409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ f1dfbb50db27.tar.bz2
 /lux-9ed6b94cef05.tar.bz2
 /luxblend25-2d621c653196.tar.bz2
 /luxrays-f2a2fb7de23b.tar.bz2
+/lux-a041e87b9732.tar.bz2
+/luxblend25-08a5e276dcc5.tar.bz2
+/luxrays-6907bd2846bf.tar.bz2
diff --git a/LuxRender.spec b/LuxRender.spec
index 290987d..23f8724 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -1,9 +1,9 @@
 # [Fedora] Turn off the brp-python-bytecompile script 
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
-%global hash0 9ed6b94cef05
-%global hash1 2d621c653196
-%global hash2 f2a2fb7de23b
+%global hash0 a041e87b9732
+%global hash1 08a5e276dcc5
+%global hash2 6907bd2846bf
 
 Name:           LuxRender
 Version:        1.0
@@ -20,10 +20,13 @@ Source2:        http://src.luxrender.net/luxrays/file/luxrays-%{hash2}.tar.bz2
 Source3:        luxblend-default.cfg
 Patch0:         lux-45d3e13eb94c-ld.patch
 Patch1:         lux-0.8-shared.patch
-Patch2:         luxrays-1.0_rc3-ld.patch
+Patch2:         luxrays-1.0-ld.patch
 Patch3:		luxrays-boost.patch
 Patch4:		lux-1.0rc3-time_utc_fix.patch
 
+#LuxRender use intensively SSE3
+ExclusiveArch:  %{ix86} x86_64 ia64
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
 BuildRequires:  cmake
@@ -103,6 +106,7 @@ developing applications that use %{name}.
 #patch0 -p1 -b .ld
 #patch1 -p1 -b .ld
 #Disable tweaking
+%if 0
 sed -i -e 's/-O3//' CMakeLists.txt
 %ifarch i686
 sed -i -e 's/-msse2/-msse/' CMakeLists.txt
@@ -113,16 +117,18 @@ sed -i -e 's/-msse2//' CMakeLists.txt
 %ifnarch %{ix86} x86_64 ia64
 sed -i -e 's/-mfpmath=sse//' CMakeLists.txt
 %endif
+%endif
 
 #Patching luxrays
-#pushd luxrays-%{hash2}
+pushd luxrays-%{hash2}
 %patch2 -p1 -b .ld
-#popd
+popd
 
 # Patch for new boost release
 #patch3 -p1 -b .boost
-
+%if 0%{fedora} > 17
 %patch4 -p1 -b .time_utc_fix
+%endif
 
 #Fix eol encoding
 find luxblend25-%{hash1}/src/luxrender -type f -exec dos2unix {} ';'
@@ -231,10 +237,6 @@ install -pm 0644 %{SOURCE3} \
 
 
 %changelog
-* Thu Oct  4 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1.0-1
-- Rebuilt for blender-2.64
-- Boots >= 1.50 is required as an BR
-
 * Wed Oct 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.0-1
 - Update to 1.0 final
 - Use ExclusiveArch as the package still heavily rely on SSE.
diff --git a/luxrays-1.0_rc1-ld.patch b/luxrays-1.0-ld.patch
similarity index 50%
rename from luxrays-1.0_rc1-ld.patch
rename to luxrays-1.0-ld.patch
index 4bfbb99..7bbad54 100644
--- a/luxrays-1.0_rc1-ld.patch
+++ b/luxrays-1.0-ld.patch
@@ -1,6 +1,6 @@
-diff -up lux-0488d0d3ad0a/luxrays-396d39b06aa6/samples/smallluxgpu/CMakeLists.txt.ld lux-0488d0d3ad0a/luxrays-396d39b06aa6/samples/smallluxgpu/CMakeLists.txt
---- lux-0488d0d3ad0a/luxrays-396d39b06aa6/samples/smallluxgpu/CMakeLists.txt.ld	2012-04-13 05:40:59.000000000 +0200
-+++ lux-0488d0d3ad0a/luxrays-396d39b06aa6/samples/smallluxgpu/CMakeLists.txt	2012-04-26 23:55:01.668477700 +0200
+diff -up luxrays-6907bd2846bf/samples/smallluxgpu/CMakeLists.txt.ld luxrays-6907bd2846bf/samples/smallluxgpu/CMakeLists.txt
+--- luxrays-6907bd2846bf/samples/smallluxgpu/CMakeLists.txt.ld	2012-10-02 20:48:49.000000000 +0200
++++ luxrays-6907bd2846bf/samples/smallluxgpu/CMakeLists.txt	2012-10-04 00:26:04.072900252 +0200
 @@ -176,6 +176,7 @@ add_executable(slg ${SMALLLUXGPU_SRCS})
  TARGET_LINK_LIBRARIES(slg luxrays ${GLEW_LIBRARY} ${OPENGL_LIBRARY})
  TARGET_LINK_LIBRARIES(slg ${OpenCL_LIBRARY})
diff --git a/sources b/sources
index fe63ef4..ad7a16a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-567c5e06394ad5c2297904770565cab0  lux-9ed6b94cef05.tar.bz2
-db573c5289fab9434e570f9f85e9177c  luxblend25-2d621c653196.tar.bz2
-89046ebddc994757c2f87e7c44ce9154  luxrays-f2a2fb7de23b.tar.bz2
+575a23413a52b9752599e20307e507d4  lux-a041e87b9732.tar.bz2
+73b2792c751ff78dcb299350c94ee548  luxblend25-08a5e276dcc5.tar.bz2
+2035de187facdab9940bc170e364b1ce  luxrays-6907bd2846bf.tar.bz2