[blender: 2/2] Definition of blender_api macro

[Jochen Schmitt]

commit 59c3692f9fc322c1f35506c36f1bb19f6fdc749a
Merge: f41080f 458d705
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue May 17 17:37:50 2011 +0200

    Definition of blender_api macro

 blender-2.56-syspath.patch       |   12 -----
 blender-2.57-CVE-2009-3850.patch |   88 ++++++++++++++++++++++++++++++++++++++
 blender-2.57-syspath.patch       |   34 +++++++++++++++
 blender.spec                     |   37 ++++++++++++----
 macros.blender                   |    9 +++-
 5 files changed, 155 insertions(+), 25 deletions(-)
---
diff --cc blender.spec
index 0ee88bb,97d3238..b3eb2b5
--- a/blender.spec
+++ b/blender.spec
@@@ -9,7 -7,7 +9,7 @@@
  Name:           blender
  Epoch:		1
  Version:        2.57b
--Release: 	1%{?dist}
++Release: 	2%{?dist}
  
  Summary:        3D modeling, animation, rendering and post-production
  
@@@ -224,9 -227,11 +229,11 @@@ install -p -D -m 644 doc/manpage/blende
  
  mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
  
 -sed -e 's/@VERSION@/%{version}/g' %{SOURCE10} \
 +sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
       >${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.blender
  
+ %find_lang %{name}
+ 
  %clean
  rm -rf ${RPM_BUILD_ROOT}
  
@@@ -267,8 -272,15 +274,18 @@@ fi || 
  %{_sysconfdir}/rpm/macros.blender
  
  %changelog
- * Tue May 17 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57b-1
- - Minor upstream update
++* Tue May 17 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57b-2
++- Definition of blender_api macro
++
+ * Fri Apr 29 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57b-1
+ - New minor upstream update
+ 
+ * Wed Apr 27 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57-3
+ - Add patch to solve CVE-2009-3850 (#5333395)
+ 
+ * Sat Apr 16 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57-2
+ - Add plugin directory
+ - Add locale
  
  * Thu Apr 14 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57-1
  - First non-beta release of the 2.5 series (taken from svn)
diff --cc macros.blender
index 70865a6,88f941a..390739b
--- a/macros.blender
+++ b/macros.blender
@@@ -1,4 -1,4 +1,7 @@@
- y%blender_version @VERSION@
 -%blender_version @VERSION@
++blender_api @VERSION@
  
--%blender_libdir %{_datadir}/blender/%{blender_version}
--%blender_archdir %{_libdir}/blender/%{blender_version}
++%blender_libdir %{_datadir}/blender/%{blender_api}
++%blender_archdir %{_libdir}/blender/%{blender_api}
++
++%blender_requires \
++Requires: blender(ABI) = %{blender_api}