[LuxRender/f16] Fix issue with missing blender addon

Jochen Schmitt s4504kr at fedoraproject.org
Mon Nov 21 18:43:02 UTC 2011


commit c63d025b2025e2d7018dfb88cfee6d4dc58eb6f6
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Nov 21 18:53:06 2011 +0100

    Fix issue with missing blender addon

 LuxRender.spec |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/LuxRender.spec b/LuxRender.spec
index 069f8ff..76d86ff 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -1,12 +1,13 @@
+# [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 45d3e13eb94c
 %global hash1 e7534273b94a
 %global hash2 e14ba5b1d111
 
-%global _python_bytecompile_errors_terminate_build 0
-
 Name:           LuxRender
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lux Renderer, an unbiased rendering system
 
 Group:          Applications/Multimedia
@@ -44,6 +45,8 @@ BuildRequires:  wxGTK-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXmu-devel
 
+BuildRequires:	blender-rpm-macros > 2.59-2
+
 Requires:  %{name}-core = %{version}-%{release}
 
 
@@ -69,7 +72,7 @@ The %{name}-core package contains core binaries for using %{name}.
 Summary:        Blender export plugin to %{name}
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}
-Requires:       blender >= 2.58
+%blender_requires
 
 %description    blender
 The %{name}-blender package contains the plugin for Blender
@@ -174,13 +177,14 @@ desktop-file-install --vendor "" --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/luxrender.desktop
 
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config
+mkdir -p $RPM_BUILD_ROOT%{blender_libdir}/scripts/bpydata/config
+mkdir -p $RPM_BUILD_ROOT%{blender_addons}
 
 cp -pr luxblend25-%{hash1}/src/luxrender \
-  $RPM_BUILD_ROOT%{_datadir}/blender/scripts/
+  $RPM_BUILD_ROOT%{blender_addons}/
 
 install -pm 0644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
+  $RPM_BUILD_ROOT%{blender_libdir}/scripts/bpydata/config/luxblend.cfg
 
 
 
@@ -207,8 +211,8 @@ install -pm 0644 %{SOURCE3} \
 
 %files blender
 %defattr(-,root,root,-)
-%{_datadir}/blender/scripts/luxrender
-%{_datadir}/blender/scripts/bpydata/config/luxblend.cfg
+%{blender_addons}/luxrender/
+%{blender_libdir}/scripts/bpydata/config/luxblend.cfg
 
 %files devel
 %defattr(-,root,root,-)
@@ -217,6 +221,9 @@ install -pm 0644 %{SOURCE3} \
 
 
 %changelog
+* Mon Nov 21 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-3
+- Fix issue with missing blender addon (#754945)
+
 * Sun Aug 14 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.8.0-2
 - Rebuild for boost
 


More information about the scm-commits mailing list