[LuxRender] Update to 0.7

[Nicolas Chauvet]

commit 0bac6b88ec38e812cf77d4d4b854dcb9edf532ff
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Aug 22 23:38:39 2010 +0200

    Update to 0.7

 .gitignore             |    2 +
 LuxBlend_0.6.1.py      | 6725 ------------------------------------------------
 LuxRender.spec         |   52 +-
 lux-0.6.1-shared.patch |   14 -
 lux-0.7-shared.patch   |   14 +
 sources                |    3 +-
 6 files changed, 42 insertions(+), 6768 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eea56fe..0e65add 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 lux-0.6.1.tar.bz2
+/45f2ed7f09f7.tar.bz2
+/f1dfbb50db27.tar.bz2
diff --git a/LuxRender.spec b/LuxRender.spec
index a713029..0743b42 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -1,17 +1,19 @@
+%global hash 45f2ed7f09f7
+%global hash2 f1dfbb50db27
+
 Name:           LuxRender
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        Lux Renderer, an unbiased rendering system
 
 Group:          Applications/Multimedia
 License:        GPLv3+ and BSD
 URL:            http://www.luxrender.net
-#Taken from http://src.luxrender.net/lux/archive/36533b0843bd.tar.bz2 AKA 6.1 release
-Source0:        lux-%{version}.tar.bz2
-#http://src.luxrender.net/luxblend/raw-file/4b8109987265/LuxBlend_0.1.py
-Source1:        LuxBlend_%{version}.py
+#Taken from http://src.luxrender.net/lux/archive/45f2ed7f09f7.tar.bz2 AKA 7.0 release
+Source0:        http://src.luxrender.net/lux/archive/%{hash}.tar.bz2
+Source1:        http://src.luxrender.net/luxblend/archive/%{hash2}.tar.bz2
 Source2:        luxblend-default.cfg
-Patch0:         lux-0.6.1-shared.patch
+Patch0:         lux-0.7-shared.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
@@ -21,6 +23,7 @@ BuildRequires:  bison
 BuildRequires:  boost-devel
 BuildRequires:  flex
 BuildRequires:  fltk-devel
+BuildRequires:  freeimage-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -64,22 +67,18 @@ to export into %{name}
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-devel-docs = %{version}-%{release}
+Obsoletes:      %{name}-devel-docs < 0.7
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        devel-docs
-Summary:        Documentation for developing %{name} applications
-Group:          Documentation
-
-%description devel-docs
-The %{name}-devel-docs package contains the documentation needed to develop
-applications with %{name}.
 
 
 %prep
-%setup -q -n lux-%{version}
+%setup -q -n lux-%{hash}
+%setup -q -D -T -a 1 -n lux-%{hash}
 %patch0 -p1 -b .shared
 #Disable tweaking
 sed -i -e 's/-O3//' CMakeLists.txt
@@ -101,11 +100,6 @@ make %{?_smp_mflags} VERBOSE=1
 
 popd
 
-# generate doc
-pushd doxygen
-  doxygen doxygen.conf
-popd
-
 
 %install
 pushd build
@@ -122,13 +116,14 @@ desktop-file-install --vendor "" --delete-original \
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config
 
-install -pm 0644 %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/blender/scripts/LuxBlend_%{version}.py
-
+install -pm 0644 luxblend-%{hash2}/LuxBlend_0.1.py \
+  $RPM_BUILD_ROOT%{_datadir}/blender/scripts/
 
 install -pm 0644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
 
+
+
 %post lib -p /sbin/ldconfig
 
 %postun lib -p /sbin/ldconfig
@@ -137,7 +132,7 @@ install -pm 0644 %{SOURCE2} \
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt COPYING.txt
-#{_bindir}/wxluxgui
+%{_bindir}/luxrenderwx
 %{_bindir}/luxrender
 %{_datadir}/pixmaps/luxrender.svg
 %{_datadir}/applications/luxrender.desktop
@@ -153,7 +148,7 @@ install -pm 0644 %{SOURCE2} \
 
 %files blender
 %defattr(-,root,root,-)
-%{_datadir}/blender/scripts/LuxBlend_%{version}.py*
+%{_datadir}/blender/scripts/LuxBlend_0.1.py*
 %{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
 
 %files devel
@@ -161,11 +156,12 @@ install -pm 0644 %{SOURCE2} \
 %{_includedir}/luxrender/
 %{_libdir}/*.so
 
-%files devel-docs
-%defattr(-,root,root,-)
-%doc doxygen/html
 
 %changelog
+* Sun Aug 22 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.7-1
+- Update to 0.7
+- Obsoletes LuxRender-devel-docs
+
 * Wed Aug 04 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.6.1-4
 - Rebuild for Boost soname bump
 - Updated spec to match current guidelines
diff --git a/lux-0.7-shared.patch b/lux-0.7-shared.patch
new file mode 100644
index 0000000..b5a312d
--- /dev/null
+++ b/lux-0.7-shared.patch
@@ -0,0 +1,14 @@
+diff -up lux-45f2ed7f09f7/CMakeLists.txt.shared lux-45f2ed7f09f7/CMakeLists.txt
+--- lux-45f2ed7f09f7/CMakeLists.txt.shared	2010-07-07 21:50:58.000000000 +0200
++++ lux-45f2ed7f09f7/CMakeLists.txt	2010-08-22 23:09:35.000000000 +0200
+@@ -738,8 +738,9 @@ SET( LUXQTGUI_RCS
+ LINK_DIRECTORIES(${LINK_DIRECTORIES} ${Boost_LIBRARY_DIRS} )
+ 
+ #Here we build the core library
+-ADD_LIBRARY(lux STATIC ${lux_lib_src} )
++ADD_LIBRARY(lux SHARED ${lux_lib_src} )
+ #TARGET_LINK_LIBRARIES(lux ${FREEIMAGE_LIBRARIES} ${Boost_LIBRARIES} )
++SET_TARGET_PROPERTIES(lux PROPERTIES SOVERSION 1 VERSION "1.0")
+ 
+ 
+ #############################################################################
diff --git a/sources b/sources
index 9f47d30..834f1cc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-a3531215f1c46027491e6072d9a7c4af  lux-0.6.1.tar.bz2
+b36f733a7503a996b55e5782481c5d10  45f2ed7f09f7.tar.bz2
+3b35b692296980b01580f2f32afbbccb  f1dfbb50db27.tar.bz2