From ab5286afb40de85e20429c3b137b046145a62ec0 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Feb 28 2008 21:29:11 +0000 Subject: Solve yafray plugin loading issue --- diff --git a/blender-2.45-yafray.patch b/blender-2.45-yafray.patch new file mode 100644 index 0000000..3c64b90 --- /dev/null +++ b/blender-2.45-yafray.patch @@ -0,0 +1,24 @@ +--- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.orig 2007-09-18 05:58:44.000000000 +0100 ++++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-02-05 14:32:07.000000000 +0000 +@@ -97,8 +97,8 @@ + #else + static char *alternative[]= + { +- "/usr/local/lib/", +- "/usr/lib/", ++ "/usr/local/lib64/", ++ "/usr/lib64/", + NULL + }; + +@@ -120,8 +120,8 @@ + #else + static char *alternative[]= + { +- "/usr/local/lib/yafray", +- "/usr/lib/yafray", ++ "/usr/local/lib64/yafray", ++ "/usr/lib64/yafray", + NULL + }; + diff --git a/blender.spec b/blender.spec index 886a33b..46d2057 100644 --- a/blender.spec +++ b/blender.spec @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 2%{?dist}.1 +Release: 8%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -26,6 +26,9 @@ Source6: blender-wrapper Source7: blender-2.44.config Patch1: blender-2.44-scons.patch +Patch2: blender-2.44-bid.patch +Patch3: blender-2.45-gcc43.patch +Patch4: blender-2.45-yafray.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,8 +70,12 @@ secure, multi-platform content to the web, CD-ROMs, and other media. %prep %setup -q %patch1 -p1 -b .org +%patch2 -p1 -b .bid +%patch3 -p1 -b .gcc43 +%patch4 -p1 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]") + sed -e 's|@LIB@|%{_libdir}|g' -e "s/@PYVER@/$PYVER/g" \ <%{SOURCE7} >user-config.py @@ -148,7 +155,6 @@ desktop-file-install --vendor fedora \ %clean rm -rf ${RPM_BUILD_ROOT} - %post update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -170,17 +176,36 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog -* Wed Sep 26 2007 Jochen Schmitt 2.45-2.1 -- Remove broken python-abi dep +* Thu Feb 28 2008 Jochen Schmitt - 2.45-8 +- Fix yafray load bug (#451571) + +* Sun Feb 10 2008 Jochen Schmitt 2.45-7 +- Rebuild for gcc-4.3 + +* Sat Jan 26 2008 Alex Lancaster - 2.45-6 +- Rebuild for new gettext + +* Thu Jan 17 2008 Jochen Schmitt 2.45-5 +- Fix gcc-4.3 related issues + +* Tue Oct 16 2007 Jochen Schmitt 2.45-4 +- Rebuild again for OpenEXR + +* Sun Oct 14 2007 Jochen Schmitt 2.45-3 +- Rebuild * Sun Sep 23 2007 Jochen Schmitt 2.45-2 - Change method how to determinate python version -* Sun Sep 23 2007 Jochen Schmitt 2.45-1 +* Thu Sep 20 2007 Jochen Schmitt 2.45-1 - New upstream release -* Sun Aug 12 2007 Jochen Schmitt 2.44-5 +* Thu Aug 9 2007 Jochen Schmitt 2.44-8 +- Fix koji-python issue + +* Wed Aug 8 2007 Jochen Schmitt 2.44-6 - Changing license tag +- Add python as an BR * Mon May 21 2007 Jochen Schmitt 2.44-4 - Use of $$RPM_OPT_FLAGS to compile blender