diff --git a/.gitignore b/.gitignore index 0dead84..d88accb 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.74.tar.gz /blender-2.75.tar.gz /blender-2.76.tar.gz +/blender-2.77a.tar.gz diff --git a/blender.spec b/blender.spec index 96f7fc8..7d59106 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.76 +%global blender_api 2.77 %global blender_fontdir %{_fontbasedir}/blender # [Fedora] Turn off the brp-python-bytecompile script @@ -21,8 +21,8 @@ Name: blender Epoch: 1 -Version: %{blender_api} -Release: 7%{?dist} +Version: %{blender_api}a +Release: 1%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -37,9 +37,9 @@ Source5: blender.xml Source10: macros.blender -Patch0: blender-2.76-droid.patch +#Patch0: blender-2.76-droid.patch # Patch for GCC 6 narrowing conversion error -Patch1: blender-gcc6.patch +#Patch1: blender-gcc6.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -154,9 +154,9 @@ a composition of several mono space fonts to cover several character sets. %prep -%setup -q -%patch0 -p1 -b .droid -%patch1 -p1 -b .gcc6 +%autosetup +#%%patch0 -p1 -b .droid +#%%patch1 -p1 -b .gcc6 find -name '.svn' -print | xargs rm -rf @@ -200,7 +200,8 @@ make VERBOSE=1 # %{?_smp_mflags} %install cd cmake-make -make install DESTDIR=${RPM_BUILD_ROOT} +#make install DESTDIR=${RPM_BUILD_ROOT} +%make_install cd .. # @@ -357,6 +358,10 @@ fi %license release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Fri Jul 29 2016 Richard Shaw - 1:2.77a-1 +- New upstream release +- Drop patches + * Tue Feb 16 2016 Richard Shaw - 1:2.76-7 - Rebuild for updated openCOLLADA. - Add patch for GCC 6 issues. @@ -1110,7 +1115,7 @@ fi * Mon Feb 6 2006 Jochen Schmitt 2.41-2 - Add freealut as dependancy. -* Sun Jan 30 2006 Jochen Schmitt 2.41-1 +* Sun Jan 29 2006 Jochen Schmitt 2.41-1 - Update to new upstream release. * Wed Jan 18 2006 Jochen Schmitt 2.40-2 @@ -1138,7 +1143,7 @@ fi - Update to 2.36. - Rebuild with new gcc4. -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - rebuilt * Mon Nov 15 2004 Phillip Compton 2.35-1 diff --git a/sources b/sources index 8516bd9..205fe8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f35ae56bb221bbeb21e89501fbd6c6a blender-2.76.tar.gz +bb192274fe5957ce62bce9f0557ea4b4 blender-2.77a.tar.gz