rpms/blender/FC-4 blender-2.42.config, 1.1, 1.2 blender-wrapper, 1.1, 1.2 blender.spec, 1.18, 1.19

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4373

Modified Files:
	blender-2.42.config blender-wrapper blender.spec 
Log Message:
Bring FC-4 in sync with devel/FC-5


Index: blender-2.42.config
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender-2.42.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blender-2.42.config	25 Jul 2006 21:22:51 -0000	1.1
+++ blender-2.42.config	26 Jul 2006 20:07:06 -0000	1.2
@@ -105,10 +105,10 @@
 
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = 'false'
-BF_OPENGL = '/usr'
+BF_OPENGL = '/usr/X11R6'
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIB = 'GL GLU X11 Xi'
-BF_OPENGL_LIBPATH = '/usr/lib'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
 
 ##


Index: blender-wrapper
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blender-wrapper	25 Jul 2006 21:22:51 -0000	1.1
+++ blender-wrapper	26 Jul 2006 20:07:06 -0000	1.2
@@ -8,7 +8,7 @@
 
 if [ ! -d ~/.blender ]; then
     install -d ~/.blender
-    ln -sf /usr/share/blender/locale ~/.blender
+    ln -sf /usr/share/locale ~/.blender/locale
     ln -sf /usr/share/blender/.Blanguages ~/.blender
     ln -sf /usr/share/blender/.bfont.ttf ~/.blender
     cp -a /usr/share/blender/bpydata ~/.blender


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blender.spec	25 Jul 2006 21:22:51 -0000	1.18
+++ blender.spec	26 Jul 2006 20:07:06 -0000	1.19
@@ -1,3 +1,6 @@
+%define blenderlib %{_datadir}/blender
+%define plugins %{_libdir}/blender/plugins
+
 Name:           blender
 Version:        2.42
 Release:        2%{?dist}
@@ -36,6 +39,7 @@
 BuildRequires:  SDL-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtiff-devel
+BuildRequires:	OpenEXR-devel
 
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -52,7 +56,7 @@
 
 %prep
 %setup -q -n blender2.42
-%patch1 -p1 
+%patch1 -p1 -b .org
 
 %build
 cp %{SOURCE7} user-config.py
@@ -144,17 +148,17 @@
 %{blenderlib}/VERSION
 %{blenderlib}/bpydata/
 %{blenderlib}/*.py
-%{blenderlib}/*.pyc
-%ghost %{blenderlib}/*.pyo
-%{blenderlib}/scripts/*[^o]
-%ghost %{blenderlib}/scripts/*.pyo
-%{blenderlib}/scripts/bpydata/*[^o]
-%ghost %{blenderlib}/scripts/bpydata/*.pyo
+# %{blenderlib}/*.pyc
+# %ghost %{blenderlib}/*.pyo
+%{blenderlib}/scripts/*
+# %ghost %{blenderlib}/scripts/*.pyo
+%{blenderlib}/scripts/bpydata/*
+# %ghost %{blenderlib}/scripts/bpydata/*.pyo
 %{blenderlib}/scripts/bpymodules/*.py
-%{blenderlib}/scripts/bpymodules/*.pyc
-%ghost %{blenderlib}/scripts/bpymodules/*.pyo
-%{blenderlib}/scripts/bpymodules/colladaImEx/*[^o]
-%ghost %{blenderlib}/scripts/bpymodules/colladaImEx/*.pyo
+# %{blenderlib}/scripts/bpymodules/*.pyc
+# %ghost %{blenderlib}/scripts/bpymodules/*.pyo
+%{blenderlib}/scripts/bpymodules/colladaImEx/*
+# %ghost %{blenderlib}/scripts/bpymodules/colladaImEx/*.pyo
 %{plugins}/
 %{_datadir}/mime/packages/blender.xml