Hello community,
here is the log from the commit of package blender for openSUSE:Factory
checked in at Tue Jul 12 12:11:05 CEST 2011.
--------
--- blender/blender.changes 2011-05-05 21:34:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/blender/blender.changes 2011-05-04
19:28:02.000000000 +0200
@@ -2 +2 @@
-Thu May 5 19:32:07 UTC 2011 - davejpla...@gmail.com
+Wed May 4 16:25:51 UTC 2011 - davejpla...@gmail.com
@@ -4,2 +4,24 @@
-- Added blender-2.57b-nobuffer_ftoa_utf_link.patch to fix build with
- openCOLLADA-svn839.
+- Created blender-2.57b-nobuffer_ftoa_utf_link.patch to stop
+ blender's linker looking for libs buffer, ftoa and UTF from
+ openCOLLADA as these libs are now static included in the other
+ libraries and no longer exist.
+
+-------------------------------------------------------------------
+Thu Apr 28 21:35:09 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.57b Release.
+- Fix new patch blender-2.56-gcc46.patch to apply cleanly.
+- Upstream changes :
+ *The Blender Foundation and online developer community is proud to
+ present Blender 2.57a. This is the first stable release of the
+ Blender 2.5 series, representing the culmination of many years of
+ redesign and development work.
+ *We name this version "Stable" not only because it's mostly feature
+ complete, but especially thanks to the 1000s of fixes and feature
+ updates we did since the 2.5 beta versions were published.
+ *The next 2 months we will keep working on finishing a couple of
+ left-over 2.5 targets and we expect to get feedback and bug reports
+ from users to handle as well. If all goes well, the 2.58 version
+ then can be the final release of the 2.5 series, with a massive
+ amount of new projects to be added for an exciting cycle of 2.6x
+ versions. Target is to release updates every 2 months this year.
@@ -10,0 +33,71 @@
+
+-------------------------------------------------------------------
+Sun Apr 17 15:08:37 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.57 stable
+- Upstream news :
+ The Blender Foundation and online developer community is proud to
+ present Blender 2.57. This is the first stable release of the
+ Blender 2.5 series, representing the culmination of many years of
+ redesign and development work.
+ We name this version "Stable" not only because it's mostly feature
+ complete, but especially thanks to the 1000s of fixes and feature
+ updates we did since the 2.5 beta versions were published.
+ The next 2 months we will keep working on finishing a couple of
+ left-over 2.5 targets and we expect to get feedback and bug reports
+ from users to handle as well. If all goes well, the 2.58 version
+ then can be the final release of the 2.5 series, with a massive
+ amount of new projects to be added for an exciting cycle of
+ 2.6x versions. Target is to release updates every 2 months this year.
+
+-------------------------------------------------------------------
+Thu Apr 14 10:51:48 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.57.36147 2.57 release.
+- For upstream changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Thu Apr 7 22:43:56 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.57.36007
+- For upstream changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Mon Apr 4 18:59:09 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.57.35927
+- For upstream changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Wed Mar 23 15:45:23 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.56.35927
+- For upstream changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Tue Mar 22 15:49:18 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.56.35701
+- For upstream changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Tue Mar 8 12:40:59 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.56.35402
+- Enable blenderplayer to build
+- For more changes see :
+ /usr/share/doc/packages/blender/Changes.txt
+
+-------------------------------------------------------------------
+Mon Mar 7 19:59:05 UTC 2011 - davejpla...@gmail.com
+
+- Update to blender-2.56.35390
+- Upstream changes :
+ *fix for building with opencollada 833 on linux.
+ For more changes see :
+ /usr/share/doc/packages/blender/Changes.txt
calling whatdependson for head-i586
Old:
----
blender-2.56.34784.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -18,8 +18,8 @@
# norootforbuild
%global __python3 /usr/bin/python3
-%global py3_abi_kind %(python3-config --abiflags)
%global python3_ver %(python3 -c "import sys; v=sys.version_info[:2];
print('%%d.%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%global nodot3_ver %(python3 -c "import sys; v=sys.version_info[:2];
print('%%d%%d'%%v)" 2>/dev/null || echo PYTHON-NOT-FOUND)
%global python3_prefix %(python3 -c "import sys; print(sys.prefix)"
2>/dev/null || echo PYTHON-NOT-FOUND)
%global python3_libdir
%{python3_prefix}/%{_lib}/python%{python3_ver}%{py3_abi_kind}
%global python3_incdir
%{python3_prefix}/include/python%{python3_ver}%{py3_abi_kind}
@@ -27,31 +27,43 @@
%global python3_sitelib %(python3 -c "from distutils.sysconfig import
get_python_lib; print (get_python_lib())" 2>/dev/null || echo PYTHON-NOT-FOUND)
# end python3 macros
+#Redefine _docdir macro for fedora
+%define _docdir %{_datadir}/doc/packages
+
%define collada 1
%define wplayer 1
# Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code.
%define DISTRIBUTABLE 1
-BuildRequires: pcre-devel pkg-config readline-devel
-BuildRequires: MesaGLw-devel OpenEXR-devel cmake fdupes freealut-devel
freetype2-devel ftgl-devel
-BuildRequires: boost-devel fftw3-devel gcc-c++ libogg-devel libstdc++-devel
libtheora-devel zlib-devel
-BuildRequires: libao-devel libdrm-devel libpng-devel libquicktime-devel
libtiff-devel libvorbis-devel ruby-devel
-BuildRequires: glew-devel libtool openssl-devel update-desktop-files xorg-x11
xorg-x11-devel
-BuildRequires: desktop-file-utils libsamplerate-devel libsndfile-devel
libxml2-devel shared-mime-info yasm yasm-devel
-BuildRequires: epydoc gettext-tools libexpat-devel libjack-devel
libopenssl-devel perl-libxml-perl
-BuildRequires: doxygen help2man libSDL-devel lzo-devel openal-soft-devel
perl-Text-Iconv ruby xz xz-devel
-%if 0%{?suse_version} > 1120
-BuildRequires: pkgconfig(python3)
+%if 0%{?fedora}
+BuildRequires: gettext libX11-devel libXi-devel mesa-libGLw-devel pkgconfig
xorg-x11-proto-devel
+BuildRequires: expat-devel fftw-devel freetype-devel gcc-c++ libstdc++-devel
python3-devel
+%else
+Recommends: blender-doc
+%if 0%{?suse_version} >= 1130
+BuildRequires: pkgconfig(python3) python3
%else
BuildRequires: python3 python3-devel
%endif
-#BuildRequires: libjpeg-devel
+BuildRequires: MesaGLw-devel pkg-config xorg-x11
+BuildRequires: gettext-tools libexpat-devel update-desktop-files
+%endif
+# libquicktime-devel
+BuildRequires: hicolor-icon-theme libao-devel libdrm-devel libpng-devel
libtiff-devel libvorbis-devel ruby-devel
+BuildRequires: fftw3-devel gcc-c++ glew-devel libtool openssl-devel
pcre-devel xorg-x11-devel
+BuildRequires: desktop-file-utils libsamplerate-devel libsndfile-devel
libxml2-devel shared-mime-info yasm yasm-devel
+BuildRequires: OpenEXR-devel cmake epydoc fdupes graphviz
jack-audio-connection-kit-devel liblcms-devel openssl-devel
+BuildRequires: SDL-devel doxygen help2man lzo-devel openal-soft-devel
perl-Text-Iconv ruby xz xz-devel
+%if 0%{?fedora} >= 14 || 0%{suse_version} >= 1140
BuildRequires: libjpeg62-devel
+%else
+BuildRequires: libjpeg-devel
+%endif
%if 0%{?collada} == 1
BuildRequires: openCOLLADA-devel >= svn838
%endif
-BuildRequires: liblcms-devel
+BuildRequires: graphviz liblcms-devel
%if %DISTRIBUTABLE <= 0
BuildRequires: ffmpeg-devel
%endif
@@ -60,11 +72,11 @@
License: GPLv2+
Group: Productivity/Graphics/3D Editors
Summary: A 3D Modelling And Rendering Package
-Version: 2.56.34784
-Release: 10
+Version: 2.57b
+Release: 1
Url: http://www.blender.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %{name}-%{version}.tar.xz
+Source0: %{name}-%{version}.tar.bz2
Source1: Changes.txt
Source2: geeko.blend
Source3: geeko.README
@@ -76,15 +88,24 @@
Patch1: blender-2.48-undefine-operation.patch
# Patch submitted upstream - Blender Patches item #19234,
Patch2: blender-2.50-uninit-var.patch
+Patch3: blender-2.55-gcc46fix.patch
Patch4: blender-2.56-gcc46.patch
+# libOpenCOLLADA0 no longer provides libbuffer, libftoa and libUTF this patch
fixes the build
Patch5: blender-2.57b-nobuffer_ftoa_utf_link.patch
+%if 0%{?nodot3_ver} <= 031
+# FIXME The following three patches revert blender to build with python 3.1
+Patch6: blender-2.56-svn35386.patch
+Patch7: blender-2.56-svn35395.patch
+Patch8: blender-2.57b-PYC_INTERPRETER_ACTIVE.patch
+Requires: python(abi) = 3.1
+%else
+Requires: python(abi) = 3.2
+%endif
%if %DISTRIBUTABLE == 1
-# Patch3 is needed due to the purging of everything mpeg
-Patch3: blender-2.55-blenkernel.patch
+# Patch is needed due to the purging of everything mpeg
+Patch10: blender-2.55-blenkernel.patch
%endif
-Recommends: blender-doc
-
%description
Blender is a 3D modelling and rendering package. It is the in-house
software of a high quality animation studio, Blender has proven to
@@ -104,17 +125,9 @@
and game creation and playback with cross-platform compatibility.
http://www.blender.org
-Authors:
---------
- Stichting Blender Foundation
- Frederiksstraat 12-2
- 1054 LC Amsterdam
- the Netherlands
- foundation(at)blender(dot)org
-
%package doc
Summary: Documentation for blender
-License: GPLv2+
+License: GPL v2 or later
Group: Documentation/HTML
BuildArch: noarch
@@ -129,10 +142,12 @@
%package devel
Summary: Include files for blender plugin development
-License: GPLv2+
+License: GPL v2 or later
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
+%if 0%{?suse_version}
Recommends: blender-doc
+%endif
%description devel
This package provides the include files necessary to develop and
@@ -141,14 +156,26 @@
%prep
%setup -q
+# This removes the error with python 3.1 python3-config --abiflags
+%if 0%{?nodot3_ver} <= 031
+%global py3_abi_kind $NULL
+%else
+%global py3_abi_kind %(python3-config --abiflags)
+%endif
%patch0
%patch1
%patch2
-%patch4 -p1
+%patch3
+%patch4
%patch5
+%if 0%{nodot3_ver} <= 031
+%patch6
+%patch7
+%patch8
+%endif
%if %DISTRIBUTABLE == 1
-%patch3
+%patch10
rm -rf release/scripts/presets/ffmpeg intern/audaspace/ffmpeg
find ./ -name *mpeg* -exec rm -rf {} \;
%endif
@@ -156,13 +183,13 @@
%define buildir %{_builddir}/%{name}/%{version}
echo %{buildir}
-echo "python3_version = %python3_ver"
-echo "python3_prefix = %python3_prefix"
-echo "python3_libdir = %python3_libdir"
-echo "python3_incdir = %python3_incdir"
-echo "python3_sitedir = %python3_sitedir"
-echo "python3_sitelib = %python3_sitelib"
-echo "python_sitelib = %python_sitelib"
+echo "python3 nodotver = %{?nodot3_ver}"
+echo "python3_version = %{?python3_ver}"
+echo "python3_prefix = %{?python3_prefix}"
+echo "python3_libdir = %{?python3_libdir}"
+echo "python3_incdir = %{?python3_incdir}"
+echo "python3_sitedir = %{?python3_sitedir}"
+echo "python3_sitelib = %{?python3_sitelib}"
%build
@@ -175,21 +202,26 @@
mkdir -p Build
pushd Build
# -DPYTHON_LIB=%%{_libdir}/libpython3.1.so \
+# mark_as_advanced(GLEW_LIBRARY)
+# mark_as_advanced(GLEW_INCLUDE_PATH)
+
cmake ../ \
-G"Unix Makefiles" \
-DWITH_FFTW3:BOOL=on \
-DWITH_JACK:BOOL=on \
-DWITH_CODEC_SNDFILE:BOOL=on \
-DWITH_IMAGE_OPENJPEG:BOOL=off \
+ -DWITH_INSTALL_PORTABLE:BOOL=off \
-DWITH_BUILTIN_GLEW:BOOL=off \
%if %{collada} == 1
-DWITH_OPENCOLLADA:BOOL=on \
-DOPENCOLLADA=%{_prefix} \
- -DOPENCOLLADA_LIBPATH=/%{_libdir} \
+ -DOPENCOLLADA_LIBPATH=/%{_lib} \
-DOPENCOLLADA_INC=/include \
%else
-DWITH_OPENCOLLADA:BOOL=off \
%endif
+ -DPYTHON_VERSION=%{python3_ver} \
-DPYTHON_LIBPATH=%{_libdir} \
-DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_ver}%{py3_abi_kind}.so \
-DPYTHON_INCLUDE_DIRS=%{python3_incdir} \
@@ -202,7 +234,6 @@
%else
-DWITH_CODEC_FFMPEG:BOOL=on \
%endif
- -DWITH_CXX_GUARDEDALLOC:BOOL=on \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=on \
%if %wplayer == 1
-DWITH_PLAYER:BOOL=on \
@@ -215,10 +246,13 @@
# -e 'CFLAGS="$CFLAGS `python3-config --includes` CXXFLAGS=$CFLAGS'
%install
-# Get the current release version for blender needed while building svn.
-# It works even though rpmbuild complains
-%define rlversion %(python %{buildir}/release/getversion.py)
-echo %{rlversion}
+export blender_version=$(grep BLENDER_VERSION
source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+export blender_version=$(expr $blender_version / 100).$(expr $blender_version
% 100)
+%define rlversion %(echo $blender_version)
+echo "release version = $blender_version"
+echo "rlversion is %{?rlversion}"
+
+# make install
pushd Build
make DESTDIR=%{?buildroot} install
popd
@@ -228,14 +262,14 @@
%if %wplayer == 1
# Generate man page with help2man
pushd %{buildroot}%{_mandir}/man1
-#cp -v %%{buildroot}%%{_bindir}/blenderplayer ./
-#help2man \
-# --version-string="%%{version}" \
-# --help-option="-h" -n "a utility for previewing .blend files" \
-# -s 1 -m "User Commands" -S "Stichting Blender Foundation" -N -o
blenderplayer.1 ./'blenderplayer -h ""'
-#rm blenderplayer
+cp -v %{buildroot}%{_bindir}/blenderplayer ./
+help2man \
+ --version-string="%{version}" \
+ --help-option="-h" -n "a utility for previewing .blend files" \
+ -s 1 -m "User Commands" -S "Stichting Blender Foundation" -N -o
blenderplayer.1 ./'blenderplayer -h ""'
+rm blenderplayer
popd
-cp -v %{S:5} %{buildroot}%{_mandir}/man1
+#cp -v %%{S:5} %%{buildroot}%%{_mandir}/man1
%endif
# Fix any .py files with shebangs and wrong permissions.
@@ -246,24 +280,24 @@
# Copy text files to correct place.
mkdir -p %{buildroot}%{_docdir}
-mv -f %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/
+mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}
# install blender sample.
-%__install -D -m 0644 %{S:2} %{buildroot}%{_docdir}/%{name}/
-%__install -D -m 0644 %{S:3} %{buildroot}%{_docdir}/%{name}/
-%__install -D -m 0755 %{S:4} %{buildroot}%{_bindir}/
+install -D -m 0644 %{S:2} %{buildroot}%{_docdir}/%{name}/
+install -D -m 0644 %{S:3} %{buildroot}%{_docdir}/%{name}/
+install -D -m 0755 %{S:4} %{buildroot}%{_bindir}/
# Add Changes.txt
cp -v %{S:1} %{buildroot}%{_docdir}/%{name}/
# Doxygen is broken in 11.3 see bnc # 650330
-pushd doc
-if test `doxygen --version` != 1.6.3; \
-then \
+pushd doc/doxygen
+#if test `doxygen --version` = 1.6.3; \
+#then \
# Build documentation until the script is fixed
-doxygen -u Doxyfile; \
-doxygen Doxyfile; \
-fi
+doxygen -u Doxyfile
+doxygen Doxyfile
+cp -r * %{buildroot}%{_docdir}/%{name}/; \
+#fi
-cp -r * %{buildroot}%{_docdir}/%{name}/
rm -rf %{buildroot}%{_docdir}/%{name}/Doxy*
%{buildroot}%{_docdir}/%{name}/doxy* %{buildroot}%{_docdir}/%{name}/python_api \
%{buildroot}%{_docdir}/%{name}/manpage; \
popd
@@ -274,12 +308,19 @@
rm -f %{buildroot}%{_includedir}/%{name}/blenpluginapi
# Add more icons.
+mkdir -p %{buildroot}%{_datadir}/pixmaps/
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-cp release/freedesktop/icons/16x16/blender.png
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
-cp release/freedesktop/icons/22x22/blender.png
%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/
-cp release/freedesktop/icons/32x32/blender.png
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+cp -vp release/freedesktop/icons/24x24/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/24x24/apps/
+cp -vp release/freedesktop/icons/48x48/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+cp -vp release/freedesktop/icons/256x256/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+cp -vp release/freedesktop/icons/32x32/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+cp -vp release/freedesktop/icons/16x16/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
+cp -vp release/freedesktop/icons/22x22/apps/blender.png
%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/
pushd %{buildroot}%{_datadir}/pixmaps/
ln -s ../icons/hicolor/32x32/apps/blender.png blender.png
popd
@@ -288,9 +329,10 @@
%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-ln -s ../../../../pixmaps/blender.svg
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/blender.svg
-popd
+cp -p release/freedesktop/icons/scalable/apps/blender.svg
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+#pushd %%{buildroot}%%{_datadir}/icons/hicolor/scalable/apps/
+#ln -s ../../../../pixmaps/blender.svg
%%{buildroot}%%{_datadir}/icons/hicolor/scalable/apps/blender.svg
+#popd
# Install s6=blender.xpm
%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/
@@ -298,27 +340,73 @@
rm -f %{buildroot}%{_includedir}/%{name}/CMakeLists.txt
%{buildroot}%{_includedir}/%{name}/SConscript
%{buildroot}%{_includedir}/%{name}/intern/Makefile \
%{buildroot}%{_includedir}/%{name}/intern/pluginapi.c
%{buildroot}%{_includedir}/%{name}/Makefile
-%suse_update_desktop_file -i "%{name}"
-
# x-blend.desktop
-%__install -D -m 0644 "%{S:7}"
"%{buildroot}%{_datadir}/applications/x-blend.desktop"
+%if 0%{?suse_version}
+install -D -m 0644 "%{S:7}"
"%{buildroot}%{_datadir}/applications/x-blend.desktop"
%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/x-blend.desktop
+# blender.desktop
+%suse_update_desktop_file -i "%{name}"
+%else
+%if 0%{?fedora}
+# Install the .desktop file the Fedora way
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{S:7}
+# Validate blender.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/blender.desktop
+%endif
+%endif
+
+# Remove devel files from package
+find %{buildroot}%{_datadir}/%{name}/ -name '*.c' -delete -print
+find %{buildroot}%{_datadir}/%{name}/ -name 'bmake' -delete -print
# Remove executables from buildroot/_docdir}/name
-#find %%{buildroot}%%{_docdir}/%%{name} -name *.py -delete
if test -z `find %{buildroot}%{_docdir}/%{name} -name *.py -perm 0755
-print0|xargs -0r grep -l '#!'`; \
then break;
else chmod -f 0644 `find %{buildroot}%{_docdir}/%{name} -name *.py -perm 0755
-print0|xargs -0r grep -l '#!'`; \
fi
+# Fedora 13 chokes on find_lang find errors
+%if 0%{?fedora} >= 14 || 0%{?suse_version}
%find_lang %{name}
-%fdupes -s %{buildroot}%{_datadir}
+%endif
+# fdupes macro isn't defined in fedora.
+ _target=""; \
+ _symlinks=1; \
+ fdupes -q -n -r %{buildroot}%{_datadir} | \
+ while read _file; do \
+ if test -z "$_target" ; then \
+ _target="$_file"; \
+ else \
+ if test -z "$_file" ; then \
+ _target=""; \
+ continue ; \
+ fi ; \
+ if test "$_symlinks" = 1; then \
+ ln -sf "${_target#%{buildroot}}" "$_file"; \
+ else \
+ ln -f "$_target" "$_file"; \
+ fi ; \
+ fi ; \
+ done
%post
-/usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null
+update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || :
+%if 0%{?fedora}
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%endif
%postun
-/usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null
+update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || :
+%if 0%{?fedora}
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%endif
%clean
%__rm -rf "%{buildroot}"
@@ -349,7 +437,9 @@
%{_datadir}/icons/hicolor/22x22/apps/blender.png
%{_datadir}/icons/hicolor/32x32/apps/blender.png
%{_datadir}/icons/hicolor/scalable/apps/blender.svg
-%{_datadir}/pixmaps/blender.svg
+%{_datadir}/icons/hicolor/24x24/apps/blender.png
+%{_datadir}/icons/hicolor/256x256/apps/blender.png
+%{_datadir}/icons/hicolor/48x48/apps/blender.png
%{_datadir}/pixmaps/blender.png
%files doc
++++++ Changes.txt ++++++
++++ 8224 lines (skipped)
++++ between blender/Changes.txt
++++ and /mounts/work_src_done/STABLE/blender/Changes.txt
++++++ blender-2.48-python64.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,8 +1,8 @@
Index: source/gameengine/Expressions/Value.cpp
===================================================================
---- source/gameengine/Expressions/Value.cpp.orig 2010-04-18
12:28:37.000000000 +0200
-+++ source/gameengine/Expressions/Value.cpp 2010-10-28 14:56:24.000000000
+0200
-@@ -543,8 +543,8 @@ CValue* CValue::ConvertPythonToValue(PyO
+--- source/gameengine/Expressions/Value.cpp.orig 2011-02-25
15:31:23.000000000 +0200
++++ source/gameengine/Expressions/Value.cpp 2011-03-12 16:24:09.499008286
+0200
+@@ -546,8 +546,8 @@ CValue* CValue::ConvertPythonToValue(PyO
CListValue* listval = new CListValue();
bool error = false;
++++++ blender-2.48-undefine-operation.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,7 +1,7 @@
Index: release/plugins/sequence/dnr.c
===================================================================
--- release/plugins/sequence/dnr.c.orig 2008-11-12 23:16:53.000000000
+0200
-+++ release/plugins/sequence/dnr.c 2010-10-28 14:56:30.000000000 +0200
++++ release/plugins/sequence/dnr.c 2011-03-12 16:24:13.536836492 +0200
@@ -110,9 +110,12 @@ static void doit(unsigned char * src_, u
unsigned char * dst = dst_;
++++++ blender-2.50-uninit-var.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,8 +1,8 @@
Index: extern/bullet2/src/LinearMath/btVector3.h
===================================================================
---- extern/bullet2/src/LinearMath/btVector3.h.orig 2009-03-17
23:44:58.000000000 +0200
-+++ extern/bullet2/src/LinearMath/btVector3.h 2010-10-28 14:56:38.000000000
+0200
-@@ -63,7 +63,8 @@ public:
+--- extern/bullet2/src/LinearMath/btVector3.h.orig 2011-03-12
22:34:17.000000000 +0200
++++ extern/bullet2/src/LinearMath/btVector3.h 2011-04-14 13:03:27.053601274
+0200
+@@ -70,7 +70,8 @@ public:
public:
/**@brief No initialization constructor */
@@ -14,9 +14,9 @@
Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
===================================================================
----
extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h.orig
2009-09-14 16:45:32.000000000 +0200
-+++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
2010-10-28 14:56:38.000000000 +0200
-@@ -94,7 +94,8 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimized
+---
extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h.orig
2011-03-12 22:34:17.000000000 +0200
++++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
2011-04-14 13:03:27.055601216 +0200
+@@ -107,7 +107,8 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimized
//for child nodes
int m_subPart;
int m_triangleIndex;
++++++ blender-2.55-blenkernel.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,8 +1,8 @@
Index: source/blender/blenkernel/CMakeLists.txt
===================================================================
---- source/blender/blenkernel/CMakeLists.txt.orig 2010-12-08
10:43:06.000000000 +0200
-+++ source/blender/blenkernel/CMakeLists.txt 2010-12-08 13:42:34.000000000
+0200
-@@ -136,7 +136,6 @@ set(SRC
+--- source/blender/blenkernel/CMakeLists.txt.orig 2011-04-28
19:05:03.000000000 +0200
++++ source/blender/blenkernel/CMakeLists.txt 2011-04-28 23:39:11.011100861
+0200
+@@ -143,7 +143,6 @@ set(SRC
intern/unit.c
intern/world.c
intern/writeavi.c
@@ -10,7 +10,7 @@
intern/writeframeserver.c
BKE_DerivedMesh.h
-@@ -217,7 +216,6 @@ set(SRC
+@@ -225,7 +224,6 @@ set(SRC
BKE_utildefines.h
BKE_world.h
BKE_writeavi.h
@@ -20,8 +20,8 @@
intern/CCGSubSurf.h
Index: source/gameengine/VideoTexture/CMakeLists.txt
===================================================================
---- source/gameengine/VideoTexture/CMakeLists.txt.orig 2010-12-08
10:43:06.000000000 +0200
-+++ source/gameengine/VideoTexture/CMakeLists.txt 2010-12-08
13:42:34.000000000 +0200
+--- source/gameengine/VideoTexture/CMakeLists.txt.orig 2011-04-28
19:03:24.000000000 +0200
++++ source/gameengine/VideoTexture/CMakeLists.txt 2011-04-28
23:39:11.012100836 +0200
@@ -63,7 +63,6 @@ set(SRC
PyTypeList.cpp
Texture.cpp
++++++ blender-2.56-gcc46.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,7 +1,8 @@
-diff -Naur
blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h
blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h
---- blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h
2009-09-14 11:45:32.000000000 -0300
-+++
blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h
2011-02-08 22:32:34.300937158 -0200
-@@ -177,6 +177,7 @@
+Index: extern/bullet2/src/BulletSoftBody/btSoftBody.h
+===================================================================
+--- extern/bullet2/src/BulletSoftBody/btSoftBody.h.orig 2011-04-28
19:10:16.000000000 +0200
++++ extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-04-28
23:52:48.230570602 +0200
+@@ -201,6 +201,7 @@ public:
/* Material */
struct Material : Element
{
@@ -9,7 +10,7 @@
btScalar m_kLST;
// Linear stiffness coefficient [0,1]
btScalar m_kAST;
// Area/Angular stiffness coefficient [0,1]
btScalar m_kVST;
// Volume stiffness coefficient [0,1]
-@@ -191,6 +192,7 @@
+@@ -215,6 +216,7 @@ public:
/* Node */
struct Node : Feature
{
@@ -17,7 +18,7 @@
btVector3 m_x;
// Position
btVector3 m_q;
// Previous step position
btVector3 m_v;
// Velocity
-@@ -204,6 +206,7 @@
+@@ -228,6 +230,7 @@ public:
/* Link */
struct Link : Feature
{
@@ -25,7 +26,7 @@
Node* m_n[2];
// Node pointers
btScalar m_rl;
// Rest length
int m_bbending:1;
// Bending link
-@@ -215,6 +218,7 @@
+@@ -239,6 +242,7 @@ public:
/* Face */
struct Face : Feature
{
@@ -33,7 +34,7 @@
Node* m_n[3];
// Node pointers
btVector3 m_normal;
// Normal
btScalar m_ra;
// Rest area
-@@ -255,6 +259,7 @@
+@@ -289,6 +293,7 @@ public:
/* Note */
struct Note : Element
{
@@ -41,10 +42,11 @@
const char* m_text;
// Text
btVector3 m_offset;
// Offset
int m_rank;
// Rank
-diff -Naur blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h
blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h
---- blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h
2009-10-20 07:50:24.000000000 -0200
-+++ blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h
2011-02-08 16:06:14.142965371 -0200
-@@ -37,6 +37,8 @@
+Index: extern/Eigen2/Eigen/src/Core/util/Memory.h
+===================================================================
+--- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig 2011-04-28
23:52:28.000000000 +0200
++++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2011-04-28 23:52:48.251570079
+0200
+@@ -38,6 +38,8 @@
#define EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED 0
#endif
@@ -53,42 +55,11 @@
#if defined(__APPLE__) || defined(_WIN64) ||
EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED
#define EIGEN_MALLOC_ALREADY_ALIGNED 1
#else
-diff -Naur blender-2.56-beta-source/intern/memutil/MEM_Allocator.h
blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h
---- blender-2.56-beta-source/intern/memutil/MEM_Allocator.h 2010-02-12
11:34:04.000000000 -0200
-+++ blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h
2011-02-08 15:40:37.846834599 -0200
-@@ -24,6 +24,7 @@
- #ifndef MEM_ALLOCATOR_H
- #define MEM_ALLOCATOR_H
-
-+#include <stddef.h>
- #include "guardedalloc/MEM_guardedalloc.h"
- #include "guardedalloc/BLO_sys_types.h"
-
-diff -Naur
blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp
blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp
----
blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp
2010-11-15 23:19:37.000000000 -0200
-+++
blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp
2011-02-08 16:45:20.671268280 -0200
-@@ -32,6 +32,7 @@
- #include "BL_ArmatureConstraint.h"
- #include "BLI_math.h"
- #include "BLI_string.h"
-+#include <stddef.h>
-
- #ifdef WITH_PYTHON
-
-diff -Naur
blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h
blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h
---- blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h
2010-10-31 02:11:39.000000000 -0200
-+++ blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h
2011-02-08 16:46:22.135397092 -0200
-@@ -38,6 +38,7 @@
- #include "STR_String.h"
- #include "MT_Vector3.h"
- #include "SG_QList.h"
-+#include <stddef.h>
-
- /*------------------------------
- * Python defines
---- blender-2.56.34784/source/blender/collada/AnimationImporter.cpp
2010-11-09 00:13:49.000000000 +0100
-+++ blender-2.56.34784/source/blender/collada/AnimationImporter.cpp
2011-04-28 11:42:25.437000405 +0200
-@@ -43,6 +43,7 @@
+Index: source/blender/collada/AnimationImporter.cpp
+===================================================================
+--- source/blender/collada/AnimationImporter.cpp.orig 2011-04-28
19:05:31.000000000 +0200
++++ source/blender/collada/AnimationImporter.cpp 2011-04-28
23:52:48.314568510 +0200
+@@ -52,6 +52,7 @@
#include "ArmatureImporter.h"
#include <algorithm>
++++++ blender-2.57b-PYC_INTERPRETER_ACTIVE.patch ++++++
--- /var/tmp/diff_new_pack.b3VgRX/_old 2011-07-12 12:05:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b3VgRX/_new 2011-07-12 12:05:13.000000000 +0200
@@ -1,13 +1,13 @@
Index: source/blender/python/generic/py_capi_utils.c
===================================================================
---- source/blender/python/generic/py_capi_utils.c.orig 2011-05-03
00:15:21.000000000 +0200
-+++ source/blender/python/generic/py_capi_utils.c 2011-05-03
01:00:38.793967259 +0200
+--- source/blender/python/generic/py_capi_utils.c.orig 2011-05-11
02:31:31.000000000 +0200
++++ source/blender/python/generic/py_capi_utils.c 2011-05-11
10:26:11.826560191 +0200
@@ -36,7 +36,11 @@
#include "BLI_path_util.h"
#endif
-+#if PY_VERSION_HEX < 0x03020000
-+#PYC_INTERPRETER_ACTIVE ((PyThreadState_GET()) &_PyThreadState_Current)
++#if PY_VERSION_HEX < 0x03020000 /* _Py_atomic_load_relaxed only exists in py
3.2*/
++#define PYC_INTERPRETER_ACTIVE ((_PyThreadState_GET()) != NULL)
+#else
#define PYC_INTERPRETER_ACTIVE
(((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL)
+#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
