Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2018-08-28 09:25:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Tue Aug 28 09:25:10 2018 rev:107 rq:631867 version:2.79b Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2018-06-25 11:40:50.808922232 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new/blender.changes 2018-08-28 09:25:15.700981054 +0200 @@ -1,0 +2,17 @@ +Sun Aug 26 22:42:30 UTC 2018 - [email protected] + +- Replace macro for limiting parallel builds with a working one. +- Increase memory constraints to 2GB physical/4GB total. This is + the typical minimum available anyway. +- Increase limit for parallel builds from 2 to 4. + +------------------------------------------------------------------- +Sun Aug 26 18:44:46 UTC 2018 - [email protected] + +- Remove x-blend.desktop, it does not do what it claims (opening + templates), and duplicates the existing one (bnc#1102918). +- Remove xpm file and any icons in /usr/share/pixmaps/. The latter + has been deprecated in favor of the themable /usr/share/icons/ + for a long time. + +------------------------------------------------------------------- Old: ---- blender.xpm x-blend.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.W9R2FN/_old 2018-08-28 09:25:17.684987247 +0200 +++ /var/tmp/diff_new_pack.W9R2FN/_new 2018-08-28 09:25:17.688987259 +0200 @@ -43,8 +43,6 @@ Source2: geeko.blend Source3: geeko.README Source4: blender-sample -Source6: blender.xpm -Source7: x-blend.desktop Source8: blender.appdata.xml # PATCH-FIX-UPSTREAM Patch0: 0001-Added-extra-const-to-satisfy-the-strict-clang-versio.patch @@ -290,13 +288,15 @@ make -j1 popd # A further attempt to stop out of memory failures. -export jobs=$(getconf _NPROCESSORS_ONLN) +# %%jobs is defined by the OBS and in osc local builds +%define _jobs %(jobs_max=%{?jobs}; \\\ + if [ -z "$jobs_max" ] || [ "$jobs_max" -gt 4 ]; then \\\ + echo "4"; \\\ + else \\\ + echo "${jobs_max}"; \\\ + fi; ) -%define jobs %(echo $jobs) -%if 0%{?jobs} > 2 -%define _smp_mflags -j2 -%endif -make %{?_smp_mflags} +make -j%{?_jobs} popd %install @@ -356,25 +356,11 @@ popd #cp -v %%{SOURCE5} %%{buildroot}%%{_mandir}/man1 %endif -%if 1 == 1 -# Add more icons. -mkdir -p %{buildroot}%{_datadir}/pixmaps/ -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 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ -ln -s ../icons/hicolor/scalable/apps/blender.svg %{buildroot}%{_datadir}/pixmaps -%endif %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 -desktop-file-validate %{buildroot}%{_datadir}/applications/x-blend.desktop %endif find . -name blender-softwaregl -print -exec cp -v {} %{buildroot}%{_bindir}/ \; @@ -415,12 +401,8 @@ %endif %{_datadir}/%{name}/%{_version}/scripts/ %{_datadir}/applications/blender.desktop -%{_datadir}/applications/x-blend.desktop %{_datadir}/icons/hicolor/*/apps/blender.png %{_datadir}/icons/hicolor/scalable/apps/blender.svg -%{_datadir}/pixmaps/blender.svg -%{_datadir}/pixmaps/blender.xpm -%{_datadir}/pixmaps/blender.png %dir %{_datadir}/appdata %{_datadir}/appdata/*.appdata.xml %doc %{_docdir}/%{name} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.W9R2FN/_old 2018-08-28 09:25:17.728987384 +0200 +++ /var/tmp/diff_new_pack.W9R2FN/_new 2018-08-28 09:25:17.728987384 +0200 @@ -4,10 +4,10 @@ <size unit="G">20</size> </disk> <physicalmemory> - <size unit="M">1024</size> + <size unit="G">2</size> </physicalmemory> <memory> - <size unit="M">2048</size> + <size unit="G">4</size> </memory> </hardware> </constraints>
