Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2012-05-21 10:25:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2012-04-17 21:57:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2012-05-21 10:25:15.000000000 +0200 @@ -1,0 +2,26 @@ +Fri May 11 04:33:12 UTC 2012 - [email protected] + +- Update to version 2.63a: + + See + http://www.blender.org/development/release-logs/blender-263/ + for upstream changes. +- Add blender-fix-locale-files-path.patch to fix the path where + locale files are installed. Split out a lang package with extra + locale files. +- Do not enable verbose make file logs. + +------------------------------------------------------------------- +Thu May 3 12:15:53 UTC 2012 - [email protected] + +- Used Fedora 2.62 src rpm packaged by Richard Shaw to update to + version 2.63 +- Patch blender-2.62-blenkernel.patch no longer needed upstream + remove all undistributable directories if ffmpeg is disabled or + not available. +- blender-collada858.patch no longer needed, fixed upstream +- blender-gcc47.patch no longer needed, fixed upstream +- Blender now fully compatible with "second life" see bnc#652536 +- See http://www.blender.org/development/release-logs/blender-263/ + for upstream changes. + +------------------------------------------------------------------- Old: ---- blender-2.48-python64.patch blender-2.48-undefine-operation.patch blender-2.50-uninit-var.patch blender-2.55-blenkernel.patch blender-2.55-gcc46fix.patch blender-2.56-gcc46.patch blender-2.56-svn35386.patch blender-2.56-svn35395.patch blender-2.57b-PYC_INTERPRETER_ACTIVE.patch blender-2.57b-nobuffer_ftoa_utf_link.patch blender-2.59-colladainclude.patch blender-2.59.tar.bz2 blender-collada858.patch blender-gcc47.patch New: ---- blender-2.63a.tar.gz blender-fix-locale-files-path.patch blender-getversion.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.1wn8rL/_old 2012-05-21 10:25:25.000000000 +0200 +++ /var/tmp/diff_new_pack.1wn8rL/_new 2012-05-21 10:25:25.000000000 +0200 @@ -16,26 +16,39 @@ # -%global __python3 /usr/bin/python3 -#%%global py3_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%{py3_ver}%{py3_abi_kind} -#%%global python3_incdir %%{py3_incdir}%%{py3_abi_kind} -%global python3_incdir %{python3_prefix}/include/python%{py3_ver}%{py3_abi_kind} -#%%global python3_sitedir %%{python3_libdir}/site-packages -#%%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 +%global __python %{__python3} -#Redefine _docdir macro for fedora -%define _docdir %{_datadir}/doc/packages +# [Fedora] Turn off the brp-python-bytecompile script +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define collada 1 %define wplayer 1 +%define documentation 0 # Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code. %define DISTRIBUTABLE 1 +%global svnrev 44995 + +Name: blender +Version: 2.63a +Release: 0 +%define _version 2.63 +Summary: A 3D Modelling And Rendering Package +License: GPL-2.0+ +Group: Productivity/Graphics/3D Editors +Url: http://www.blender.org/ + +Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz +Source1: Changes.txt +Source2: geeko.blend +Source3: geeko.README +Source4: blender-sample +Source5: blenderplayer.1 +Source6: blender.xpm +Source7: x-blend.desktop +Source8: blender-getversion.py +Patch0: blender-fix-locale-files-path.patch %if 0%{?fedora} BuildRequires: expat-devel BuildRequires: fftw-devel @@ -50,18 +63,25 @@ BuildRequires: python3-devel BuildRequires: xorg-x11-proto-devel %else -Recommends: blender-doc -BuildRequires: MesaGLw-devel BuildRequires: gettext-tools +%if 0%{?suse_version} > 1210 +BuildRequires: libGLw-devel +%else +BuildRequires: MesaGLw-devel +%endif BuildRequires: libexpat-devel BuildRequires: pkg-config BuildRequires: python3-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11 +%if %documentation == 1 +Recommends: blender-doc +%endif %endif # libquicktime-devel BuildRequires: OpenEXR-devel BuildRequires: SDL-devel +BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: doxygen @@ -83,7 +103,6 @@ BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libvorbis-devel -BuildRequires: libxml2-devel BuildRequires: lzo-devel BuildRequires: openal-soft-devel BuildRequires: openssl-devel @@ -98,64 +117,22 @@ BuildRequires: xz-devel BuildRequires: yasm BuildRequires: yasm-devel -%if 0%{?fedora} >= 14 || 0%{suse_version} >= 1140 +BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?fedora} >= 14 || 0%{?suse_version} >= 1140 BuildRequires: libjpeg62-devel %else BuildRequires: libjpeg-devel %endif %if 0%{?collada} == 1 -BuildRequires: openCOLLADA-devel >= svn840 +BuildRequires: openCOLLADA-devel >= svn838 %endif BuildRequires: graphviz BuildRequires: liblcms-devel -%if %DISTRIBUTABLE <= 0 -BuildRequires: ffmpeg-devel -%endif # See bnc#713346 Requires: python3-xml - -Name: blender -Summary: A 3D Modelling And Rendering Package -License: GPL-2.0+ -Group: Productivity/Graphics/3D Editors -Version: 2.59 -Release: 0 -Url: http://www.blender.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.bz2 -Source1: Changes.txt -Source2: geeko.blend -Source3: geeko.README -Source4: blender-sample -Source5: blenderplayer.1 -Source6: blender.xpm -Source7: x-blend.desktop -Patch0: blender-2.48-python64.patch -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 -# The collada include and library paths were hard coded into CMakeLists.txt and incorrect, this patch fixes the issue. -Patch9: blender-2.59-colladainclude.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 -# PATCH-FIX-UPSTREAM blender-collada858.patch [email protected] -- Starting with svn858 of openCOLLADA, the headers are installed 'more normally' in /usr/include/COLLADA* instead of /usr/include/COLLADA*/include. -Requires: python(abi) = 3.1 -%else -Requires: python(abi) = 3.2 -%endif -%if %DISTRIBUTABLE == 1 -# Patch is needed due to the purging of everything mpeg -Patch10: blender-2.55-blenkernel.patch +%if %DISTRIBUTABLE <= 0 +BuildRequires: libffmpeg-devel %endif -Patch11: blender-collada858.patch -Patch12: blender-gcc47.patch %description Blender is a 3D modelling and rendering package. It is the in-house @@ -174,11 +151,11 @@ rendering, node-based compositing, and non linear video editing, as well as an integrated game engine for real-time interactive 3D and game creation and playback with cross-platform compatibility. -http://www.blender.org +%if %documentation == 1 %package doc Summary: Documentation for blender -Group: Documentation/HTML +Group: Documentation BuildArch: noarch %description doc @@ -189,119 +166,71 @@ technical visualizations, business graphics, to do some morphing, or design user interfaces. This package includes API documentation and example plugin programs. - -%package devel -Summary: Include files for blender plugin development -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 -build plugins for Blender. - +%lang_package %prep %setup -q -%global collada_ver %(rpm -q openCOLLADA-devel --qf "%%{version}" | cut -b4-) -# 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 -%patch3 -%patch4 -%patch5 -%patch9 -%if 0%{nodot3_ver} <= 031 -%patch6 -%patch7 -%patch8 -%endif -%if %{collada_ver} >= 858 -%patch11 -p1 -%endif -%patch12 +%patch0 -p1 %if %DISTRIBUTABLE == 1 -%patch10 -rm -rf release/scripts/presets/ffmpeg intern/audaspace/ffmpeg -for i in $(find ./ -name '*mpeg*'); do rm -rf ${i}; done -%endif - -%define buildir %{_builddir}/%{name}/%{version} -echo %{buildir} - -echo "python3 nodotver = %{?nodot3_ver}" -echo "py3_version = %{?py3_ver}" -echo "python3_prefix = %{?python3_prefix}" -echo "python3_libdir = %{?python3_libdir}" -echo "python3_incdir = %{?python3_incdir}" -echo "py3_incdir = %{?py3_incdir}" -echo "python3_sitearch = %{?python3_sitearch}" -echo "python3_sitelib = %{?python3_sitelib}" - -%build +rm -rf release/scripts/presets/ffmpeg +%endif -export CFLAGS="$RPM_OPT_FLAGS -pipe -fPIC -funsigned-char -fno-strict-aliasing -g -ggdb" -export CXXFLAGS=$CFLAGS -export BF_TIFF_LIB="%{_libdir}/libtiff.so" -export BF_TIFF_INC="%{_includedir}" -export BF_GETTEXT_LIBPATH="%{_libdir}" -#WITH_INTERNATIONAL -mkdir -p Build -pushd Build -# -DPYTHON_LIB=%%{_libdir}/libpython3.1.so \ -# mark_as_advanced(GLEW_LIBRARY) -# mark_as_advanced(GLEW_INCLUDE_PATH) +# binreloc is not a part of fedora +rm -rf extern/ffmpeg +rm -rf extern/fftw +rm -rf extern/glew +rm -rf extern/libmp3lame +rm -rf extern/libopenjpeg +rm -rf extern/libredcode +rm -rf extern/ode +rm -rf extern/x264 +rm -rf extern/xvidcore +rm -rf extern/qhull +rm -rf extern/make +rm -rf extern/verse -cmake ../ \ - -G"Unix Makefiles" \ +%build +mkdir -p Build && pushd Build +cmake ../ -DBUILD_SHARED_LIBS:BOOL=off \ -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_LIB:STRING=%{_libdir} \ - -DOPENCOLLADA_INC=%{_includedir} \ - -DOPENCOLLADA_INCLUDE_DIR:STRING=%{_includedir} \ -%else - -DWITH_OPENCOLLADA:BOOL=off \ -%endif - -DPYTHON_VERSION=%{py3_ver} \ - -DPYTHON_LIBPATH=%{_libdir} \ - -DPYTHON_LIBRARY=%{_libdir}/libpython%{py3_ver}%{py3_abi_kind}.so \ - -DPYTHON_INCLUDE_DIRS=%{python3_incdir} \ - -DPYTHON_INCLUDE_DIR=%{python3_incdir} \ - -DWITH_PYTHON_INSTALL:BOOL=off \ -DWITH_PYTHON:BOOL=on \ - -DWITH_IMAGE_OPENJPEG:BOOL=off \ - -DWITH_GAMEENGINE:BOOL=on \ + -DWITH_PYTHON_INSTALL:BOOL=off \ + -DWITH_GAMEENGINE:BOOL=ON \ %if %DISTRIBUTABLE == 1 -DWITH_CODEC_FFMPEG:BOOL=off \ %else -DWITH_CODEC_FFMPEG:BOOL=on \ %endif - -DCMAKE_VERBOSE_MAKEFILE:BOOL=on \ + -DWITH_CXX_GUARDEDALLOC:BOOL=off \ %if %wplayer == 1 -DWITH_PLAYER:BOOL=on \ %else -DWITH_PLAYER:BOOL=off \ %endif + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_MOD_OCEANSIM:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -%__make %{?jobs:-j%{jobs}} + +make %{?_smp_mflags} +popd + +%if %documentation == 1 +# Build documentation +pushd doc/doxygen +doxygen -u Doxyfile +doxygen Doxyfile popd -# -e 'CFLAGS="$CFLAGS `python3-config --includes` CXXFLAGS=$CFLAGS' +mv doc/doxygen/html doc/ +rm -rf doc/doxygen +%endif %install export blender_version=$(grep BLENDER_VERSION source/blender/blenkernel/BKE_blender.h | tr -dc 0-9) @@ -312,10 +241,12 @@ # make install pushd Build -make DESTDIR=%{?buildroot} install +%make_install popd -echo %{rlversion} +# Remove folder, it's not supposed to be installed here. +rm -rf %{buildroot}%{_datadir}/%{name}/%{_version}/datafiles/fonts + # Factory is now of the opinion that every /usr/bin file needs a man page, %if %wplayer == 1 # Generate man page with help2man @@ -327,7 +258,7 @@ -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 %%{SOURCE5} %%{buildroot}%%{_mandir}/man1 %endif # Fix any .py files with shebangs and wrong permissions. @@ -337,180 +268,84 @@ fi # Copy text files to correct place. -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir} +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -v %{buildroot}%{_datadir}/doc/blender/* %{buildroot}%{_docdir}/%{name}/ +rm -rf %{buildroot}%{_datadir}/doc/blender # 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 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ +install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ +install -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/ # Add Changes.txt -cp -v %{S:1} %{buildroot}%{_docdir}/%{name}/ - -# Doxygen is broken in 11.3 see bnc # 650330 -pushd doc/doxygen -#if test `doxygen --version` = 1.6.3; \ -#then \ -# Build documentation until the script is fixed -doxygen -u Doxyfile -doxygen Doxyfile -cp -r * %{buildroot}%{_docdir}/%{name}/; \ -#fi - -rm -rf %{buildroot}%{_docdir}/%{name}/Doxy* %{buildroot}%{_docdir}/%{name}/doxy* %{buildroot}%{_docdir}/%{name}/python_api \ - %{buildroot}%{_docdir}/%{name}/manpage; \ -popd - -# blender-devel stuff soon depreciated. -mkdir -p %{buildroot}%{_includedir}/%{name} -cp -pr source/blender/blenpluginapi/* %{buildroot}%{_includedir}/%{name}/ -rm -f %{buildroot}%{_includedir}/%{name}/blenpluginapi +cp -v %{SOURCE1} %{buildroot}%{_docdir}/%{name}/ +%if 1 == 1 # 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/ -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 # Install s6=blender.xpm and s11=v-2.55 -%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/ +install -D -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -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 +ln -s ../icons/hicolor/scalable/apps/blender.svg %{buildroot}%{_datadir}/pixmaps +%endif # Install s6=blender.xpm -%__install -D -m 0644 %{S:6} %{buildroot}%{_datadir}/pixmaps/ +install -D -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ -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 +# Install blender template desktop file. +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE7} -# 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 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} -%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 +%fdupes %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/ + +%find_lang %{name} %{?no_lang_C} %post update-desktop-database &> /dev/null || : -/usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || : -%if 0%{?fedora} +update-mime-database %{_datadir}/mime &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%endif %postun -update-desktop-database &> /dev/null || : -/usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || : -%if 0%{?fedora} +update-desktop-database &> /de%{_docdir}/%{name}-devel-%{version}v/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - -%clean -%__rm -rf "%{buildroot}" - -%files -f %{name}.lang -%defattr(-,root,root) -%{_bindir}/blender -%{_bindir}/blender-thumbnailer.py -%{_bindir}/blender-sample -%{_docdir}/%{name}/geeko.* -%{_docdir}/%{name}/Changes.txt - -%if %wplayer == 1 -%{_bindir}/blenderplayer -%{_mandir}/man1/blenderplayer.1.gz -%endif -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/%{rlversion} -%{_datadir}/%{name}/%{rlversion}/* -%{_mandir}/man1/blender.1.gz +%files lang -f %{name}.lang +%files +%defattr (-, root, root) +%{_bindir}/* +%{_mandir}/man1/* +%{_datadir}/%{name} %{_datadir}/applications/blender.desktop %{_datadir}/applications/x-blend.desktop - -%{_datadir}/pixmaps/blender.xpm -%{_datadir}/icons/hicolor/16x16/apps/blender.png -%{_datadir}/icons/hicolor/22x22/apps/blender.png -%{_datadir}/icons/hicolor/32x32/apps/blender.png +%{_datadir}/icons/hicolor/*/apps/blender.png %{_datadir}/icons/hicolor/scalable/apps/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.svg +%{_datadir}/pixmaps/blender.xpm %{_datadir}/pixmaps/blender.png +%if %documentation == 0 +%doc %{_docdir}/%{name} +%else %files doc -%defattr(-,root,root) -%dir %{_docdir}/%{name}/ -%doc %{_docdir}/%{name}/* -%exclude %{_docdir}/%{name}/geeko.* -%exclude %{_docdir}/%{name}/Changes.txt - -%files devel -%defattr(-,root,root) -%dir %{_includedir}/%{name}/ -%{_includedir}/%{name}/*.h -%{_includedir}/%{name}/*.DEF +%defattr (-, root, root) +%doc doc/ +%endif %changelog ++++++ Changes.txt ++++++ ++++ 8224 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/blender/Changes.txt ++++ and /work/SRC/openSUSE:Factory/.blender.new/Changes.txt ++++++ blender-fix-locale-files-path.patch ++++++ Index: blender-2.63a/source/creator/CMakeLists.txt =================================================================== --- blender-2.63a.orig/source/creator/CMakeLists.txt +++ blender-2.63a/source/creator/CMakeLists.txt @@ -295,11 +295,16 @@ endif() if(WITH_INTERNATIONAL) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/datafiles/locale ${CMAKE_SOURCE_DIR}/release/datafiles/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) + install( + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/datafiles/locale + DESTINATION ${CMAKE_INSTALL_PREFIX}/share + PATTERN ".svn" EXCLUDE + ) endif() # helpful tip when using make Index: blender-2.63a/release/environment-unix =================================================================== --- blender-2.63a.orig/release/environment-unix +++ blender-2.63a/release/environment-unix @@ -11,7 +11,7 @@ BLENDER_USER_BASE=${HOME}/.blender/${BLENDER_VERSION} BLENDER_SYSTEM_BASE=${BLENDER_SHARE}/${BLENDER_VERSION} BLENDER_USER_DATAFILES=${HOME}/.blender/${BLENDER_VERSION}/datafiles -BLENDER_SYSTEM_DATAFILES=${BLENDER_SHARE}/${BLENDER_VERSION}/datafiles +BLENDER_SYSTEM_DATAFILES=/usr/share BLENDER_USER_PY=${HOME}/.blender/${BLENDER_VERSION}/py BLENDER_SYSTEM_PY=${BLENDER_SHARE}/${BLENDER_VERSION}/py BLENDER_USER_PLUGINS=${HOME}/.blender/${BLENDER_VERSION}/plugins Index: blender-2.63a/source/blender/blenfont/intern/blf_lang.c =================================================================== --- blender-2.63a.orig/source/blender/blenfont/intern/blf_lang.c +++ blender-2.63a/source/blender/blenfont/intern/blf_lang.c @@ -110,17 +110,7 @@ static const char *locales[] = { void BLF_lang_init(void) { - char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale"); - - BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name)); - - if (messagepath) { - BLI_strncpy(global_messagepath, messagepath, sizeof(global_messagepath)); - } - else { - printf("%s: 'locale' data path for translations not found, continuing\n", __func__); - global_messagepath[0] = '\0'; - } + *global_messagepath = "/usr/share/locale/"; } Index: blender-2.63a/source/blender/blenlib/intern/path_util.c =================================================================== --- blender-2.63a.orig/source/blender/blenlib/intern/path_util.c +++ blender-2.63a/source/blender/blenlib/intern/path_util.c @@ -994,38 +994,6 @@ static int get_path_system(char *targetp char system_path[FILE_MAX]; const char *system_base_path; - - /* first allow developer only overrides to the system path - * these are only used when running blender from source */ - char cwd[FILE_MAX]; - char relfolder[FILE_MAX]; - - if (folder_name) { - if (subfolder_name) { - BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name); - } - else { - BLI_strncpy(relfolder, folder_name, sizeof(relfolder)); - } - } - else { - relfolder[0]= '\0'; - } - - /* try CWD/release/folder_name */ - if (BLI_current_working_dir(cwd, sizeof(cwd))) { - if (test_path(targetpath, cwd, "release", relfolder)) { - return 1; - } - } - - /* try EXECUTABLE_DIR/release/folder_name */ - if (test_path(targetpath, bprogdir, "release", relfolder)) - return 1; - /* end developer overrides */ - - - system_path[0] = '\0'; if (test_env_path(system_path, envvar)) { ++++++ blender-getversion.py ++++++ #!/usr/bin/env python # -*- mode: python; tab-width: 4; indent-tabs-mode: t; -*- # vim: tabstop=4 # $Id: getversion.py 33381 2010-11-29 17:23:06Z ton $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2008 by the Blender Foundation # All rights reserved. # # The Original Code is: see repository. # # Contributor(s): see repository. # <pep8-80 compliant> import sys import os import re nanblenderhome = os.getenv("NANBLENDERHOME") if nanblenderhome is None: nanblenderhome = os.path.dirname(os.path.abspath(sys.argv[0])) + "/.." config = nanblenderhome + "/source/blender/blenkernel/BKE_blender.h" infile = open(config) major = None minor = None for line in infile.readlines(): m = re.search("#define BLENDER_VERSION\s+(\d+)", line) if m: major = m.group(1) m = re.search("#define BLENDER_SUBVERSION\s+(\d+)", line) if m: minor = m.group(1) if minor and major: major = float(major) / 100.0 break infile.close() # Major was changed to float, but minor is still a string # Note: removed returning minor, this messes up with install path code in BLI module if major: print "%.2f" % major else: print "unknownversion" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
