[LuxRender: 2/3] Fix boost API Change issue

[Jochen Schmitt]

commit b3cc212ba5fb236260a926d4e45e35a8a4e92c99
Merge: a98eff2 0354cac
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Nov 23 19:56:45 2011 +0100

    Fix boost API Change issue

 LuxRender.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc LuxRender.spec
index 476fe6b,62f6119..d865194
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@@ -7,7 -7,7 +7,7 @@@
  
  Name:           LuxRender
  Version:        0.8.0
--Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        Lux Renderer, an unbiased rendering system
  
  Group:          Applications/Multimedia
@@@ -72,8 -71,8 +72,8 @@@ The %{name}-core package contains core 
  %package        blender
  Summary:        Blender export plugin to %{name}
  Group:          Applications/Multimedia
--Requires:       %{name} = %{version}-%{release}
 -Requires:       blender
++Requires:       %{name} = %{version}-%{release
 +Requires:	%{blender_requires}
  
  %description    blender
  The %{name}-blender package contains the plugin for Blender
@@@ -225,10 -221,9 +225,14 @@@ install -pm 0644 %{SOURCE3} 
  
  
  %changelog
- * Wed Nov 23 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-6
++<<<<<<< HEAD
++* Wed Nov 23 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-7
 +- Rebuilt to fix boost API change
 +- Change user of blender-rpm macros
 +
+ * Tue Nov 22 2011 Peter Robinson <pbrobinson at fedoraproject.org> -0.8.0-6
+ - Rebuild for boost 1.48
+ 
  * Mon Nov 21 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-5
  - Fix issue with missing blender addon (#754945)