rpms/blender/devel blender-2.44-bid.patch, NONE, 1.1 blender.spec, 1.61, 1.62

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Thu Aug 9 16:39:36 UTC 2007


Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28077

Modified Files:
	blender.spec 
Added Files:
	blender-2.44-bid.patch 
Log Message:
Try to fix build id issue

blender-2.44-bid.patch:

--- NEW FILE blender-2.44-bid.patch ---
--- blender-2.44/release/plugins/bmake.bid	2004-12-27 20:28:48.000000000 +0100
+++ blender-2.44/release/plugins/bmake	2007-08-09 18:13:34.000000000 +0200
@@ -60,10 +60,10 @@ elif ( test $UNAME = "OpenBSD" ) then
 	LDFLAGS="-Bshareable";
 elif ( test $UNAME = "Linux" ) then
 	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
+	CFLAGS="${RPM_OPT_FLAGS} -fPIC -funsigned-char";
 
-	LD="ld";
-	LDFLAGS="-Bshareable";
+	LD="gcc";
+	LDFLAGS="--shared ${RPM_OPT_FLAGS}";
 elif ( test $UNAME = "SunOS" ) then
 	CC="cc";
 	CFLAGS="-O";


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- blender.spec	9 Aug 2007 15:02:25 -0000	1.61
+++ blender.spec	9 Aug 2007 16:39:03 -0000	1.62
@@ -4,7 +4,7 @@
 
 Name:           blender
 Version:        2.44
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -27,6 +27,7 @@
 Source7:	blender-2.44.config
 
 Patch1:         blender-2.44-scons.patch
+Patch2:		blender-2.44-bid.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +69,8 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .org
+%patch2 -p1 -b .bid
+
 sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
 	 <%{SOURCE7} >user-config.py
 
@@ -168,7 +171,7 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
-* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-7
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-8
 - Fix koji-python issue
 
 * Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-6




More information about the fedora-extras-commits mailing list