Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2012-11-08 17:19:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blender", Maintainer is "PNemec@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2012-11-05 14:54:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2012-11-08 17:19:13.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 5 08:20:18 UTC 2012 - Rene.vanPaassen@gmail.com + +- need buildroot for SLED +- need to define PYTHON_LIBPATH etc for SLED also +- modified desktop file installation for SLED + +------------------------------------------------------------------- @@ -27,0 +35,5 @@ + +------------------------------------------------------------------- +Thu Jun 21 12:24:47 UTC 2012 - Rene.vanPaassen@gmail.com + +- Need a BuildRoot: defined, for building on SLE 11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.C0WdAE/_old 2012-11-08 17:19:16.000000000 +0100 +++ /var/tmp/diff_new_pack.C0WdAE/_new 2012-11-08 17:19:16.000000000 +0100 @@ -107,6 +107,7 @@ BuildRequires: liblcms-devel # See bnc#713346 Requires: python3-xml +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Blender is a 3D modelling and rendering package. It is the in-house @@ -184,7 +185,7 @@ -DWITH_INSTALL_PORTABLE:BOOL=OFF \ -DWITH_BUILTIN_GLEW:BOOL=OFF \ -DWITH_MOD_OCEANSIM:BOOL=OFF \ -%if 0%{?suse_version} > 1220 +%if 0%{?suse_version} > 1220 || 0%{?sles_version} -DPYTHON_VERSION=3.3 \ -DPYTHON_LIBPATH=/usr/lib \ -DPYTHON_LIBRARY=python3.3m \ @@ -267,11 +268,17 @@ # Install s6=blender.xpm install -D -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ +%if 0%{?sles_version} +%suse_update_desktop_file -i -n -G "Blender Template" x-blend +%suse_update_desktop_file -i -n blender +%else + # Install blender template desktop file. desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE7} # Validate blender.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/blender.desktop +%endif if test -z `find %{buildroot}%{_docdir}/%{name} -name *.py -perm 0755 -print0|xargs -0r grep -l '#!'`; \ then break; ++++++ x-blend.desktop ++++++ --- /var/tmp/diff_new_pack.C0WdAE/_old 2012-11-08 17:19:16.000000000 +0100 +++ /var/tmp/diff_new_pack.C0WdAE/_new 2012-11-08 17:19:16.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Comment=Blender Template Name=blender -Icon=/usr/share/pixmaps/blender.xpm +Icon=blender Type=Application MimeType=application/x-blend; +X-Desktop-File-Install-Version=0.20 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de