Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit blender
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Jan 2008 12:22:29 +0100
  • Message-id: <20080107112230.2712B678338@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package blender
checked in at Mon Jan 7 12:22:29 CET 2008.

--------
--- blender/blender.changes 2007-10-03 14:01:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/blender/blender.changes 2008-01-04
17:29:40.000000000 +0100
@@ -1,0 +2,4 @@
+Fri Jan 4 15:42:39 CET 2008 - pnemec@xxxxxxx
+- do not build againt key_internal.h mt19937int.c [#333796]
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ blender-doc.spec ++++++
--- /var/tmp/diff_new_pack.Y18572/_old 2008-01-07 12:20:24.000000000 +0100
+++ /var/tmp/diff_new_pack.Y18572/_new 2008-01-07 12:20:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package blender-doc (Version 2.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -16,7 +16,7 @@
Group: Productivity/Graphics/Visualization/Raytracers
AutoReqProv: on
Version: 2.3
-Release: 82
+Release: 94
Source: BlenderManualIen.23.html.tar.bz2
BuildArch: noarch
Url: http://www.blender.org
@@ -60,6 +60,7 @@
%dir /usr/share/doc/packages/blender
%dir /usr/share/doc/packages/blender/BlenderManual
%doc /usr/share/doc/packages/blender/BlenderManual/*
+
%changelog
* Thu Jun 29 2006 - pnemec@xxxxxxx
- new spec file for package blender-doc

++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.Y18572/_old 2008-01-07 12:20:24.000000000 +0100
+++ /var/tmp/diff_new_pack.Y18572/_new 2008-01-07 12:20:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package blender (Version 2.45)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -23,7 +23,7 @@
AutoReqProv: on
Requires: yafray
Version: 2.45
-Release: 1
+Release: 29
%if %DISTRIBUTABLE <= 0
Source: %{name}-%{version}.tar.bz2
%else
@@ -98,6 +98,12 @@
EOF

%build
+%if %DISTRIBUTABLE > 0
+ # just by sure this file will not be used #262776
+ rm ./source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h
+ rm ./intern/keymaker/key_internal.h
+ rm ./intern/keymaker/mt19937int.c
+%endif
rm -rf ../build
scons BF_QUIET=0 \
BF_PYTHON_VERSION=2.5 \
@@ -121,8 +127,6 @@
WITH_BF_FFMPEG=yes \
%endif
CFLAGS="${RPM_OPT_FLAGS}"
-# just by sure this file will not be used #262776
-rm ./source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h
%if %DISTRIBUTABLE <= 0
scons BF_QUIET=0 \
BF_PYTHON_VERSION=2.5 \
@@ -142,9 +146,7 @@
BF_QUICKTIME_INC=/usr/include/quicktime \
WITH_BF_FTGL=yes \
WITH_BF_ICONV=no \
- %if %DISTRIBUTABLE <= 0
WITH_BF_FFMPEG=yes \
- %endif
CFLAGS="${RPM_OPT_FLAGS}" blenderplayer
%endif
# Build plugins
@@ -215,7 +217,10 @@
%{_docdir}/%{name}
/usr/share/applications/blender.desktop
/usr/share/pixmaps/blender.xpm
+
%changelog
+* Fri Jan 04 2008 - pnemec@xxxxxxx
+- do not build againt key_internal.h mt19937int.c [#333796]
* Wed Oct 03 2007 - coolo@xxxxxxx
- update to 2.45 to fix compilation with gcc43
* Thu Jul 05 2007 - coolo@xxxxxxx









++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread