[engrid] Update to latest git

[Sandro Mani]

commit 0e353e00da46db22484e6db1afb4b8e7a5c36a8f
Author: Sandro Mani <manisandro at gmail.com>
Date:   Sun Mar 22 11:44:53 2015 +0100

    Update to latest git

 engrid.spec | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)
---
diff --git a/engrid.spec b/engrid.spec
index 867657c..5546670 100644
--- a/engrid.spec
+++ b/engrid.spec
@@ -1,8 +1,8 @@
 # Refer to the comment for Source0 below on how to obtain the source tarball
 # The saved file has format enGits-engrid-$version-$ahead-g$shortcommit.tar.gz
-%global commit e6d55f564c20a8d13bee6bba6280a32320f1bde2
+%global commit baef0cebdebbe59cf77aea5ecef5d92a36fac20f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ahead 264
+%global ahead 418
 
 # If ahead is 0, the tarball corresponds to a release version, otherwise to a git snapshot
 %if %{ahead} > 0
@@ -54,8 +54,6 @@ BuildRequires:  tex(titlesec.sty)
 BuildRequires:  tex(ucs.sty)
 BuildRequires:  tex(xspace.sty)
 BuildRequires:  tex(german.ldf)
-# For blender version detection
-BuildRequires:  blender
 
 Requires:       hicolor-icon-theme
 
@@ -65,18 +63,12 @@ enGrid uses the Netgen library for tetrahedral grid generation and an in-house
 development for prismatic boundary layer grids. Internally, enGrid uses the VTK
 data structures as well as the *.vtu file format.
 
-%package blender
-Summary:        Blender scripts for enGrid
-BuildArch:      noarch
-Requires:       blender
-
-%description blender
-This package contains various Blender scripts for use with enGrid.
-
 
 %package doc
 Summary:        Documentation and Tutorials for enGrid
 BuildArch:      noarch
+Obsoletes:      %{name}-blender < 1.4.0-6
+Provides:       %{name}-blender = %{version}-%{release}
 
 %description doc
 This package contains the documentation and tutorials for enGrid.
@@ -129,14 +121,6 @@ desktop-file-install \
   engrid.desktop
 install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/engrid.png
 
-# Blender scripts
-# Determine blender version
-ver=`blender -v | grep -Eo '[0-9]\.[0-9]+'`
-# Copy most recent version only
-newest=`ls -1 src/blender_scripts/ | sort -n | tail -1`
-install -dm 0755 %{buildroot}%{_datadir}/blender/$ver/scripts/addons
-cp -a src/blender_scripts/$newest %{buildroot}%{_datadir}/blender/$ver/scripts/addons/engrid
-
 # Manpage
 install -Dpm 0644 debian/engrid.1 %{buildroot}%{_mandir}/man1/engrid.1
 
@@ -159,24 +143,23 @@ fi
 
 
 %files
-%doc licence.txt
+%license licence.txt
 %{_bindir}/engrid
 %{_datadir}/applications/engrid.desktop
 %{_datadir}/icons/hicolor/64x64/apps/engrid.png
 %{_libdir}/libengrid.so.*
 %{_mandir}/man1/engrid.1*
 
-%files blender
-%doc licence.txt
-%{_datadir}/blender/*/scripts/addons/engrid/
 
 %files doc
-%doc licence.txt tutorials manual/manual.pdf
+%doc tutorials manual/manual.pdf src/blender_scripts
+%license licence.txt
 
 
 %changelog
-* Thu Mar 19 2015 Orion Poplawski <orion at cora.nwra.com> - 1.4.0-6.gite6d55f5
-- Rebuild for vtk 6.2.0
+* Sun Mar 22 2015 Sandro Mani <manisandro at gmail.com> - 1.4.0-6.gitbaef0ce
+- Update to latest git
+- Remove blender subpackage and ship them in -doc, they are out of date anyway
 
 * Tue Oct 07 2014 Sandro Mani <manisandro at gmail.com> - 1.4.0-5.gite6d55f5
 - Rebuild (netgen-mesher)