[blender: 1/2] Temporarly commit

Jochen Schmitt s4504kr at fedoraproject.org
Tue May 17 15:44:32 UTC 2011


commit f41080f0185a16734d37bd431220f0f3ca04dbbf
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue May 17 16:56:55 2011 +0200

    Temporarly commit

 .gitignore     |    1 +
 blender.spec   |   13 +++++++++----
 macros.blender |    2 +-
 sources        |    2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55ebd5b..7490d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ blender-2.49b-repack.tar.bz2
 /blender-2.56.svn36007.tar.bz2
 /blender-2.57.svn36147.tar.bz2
 /blender-2.57.tar.gz
+/blender-2.57b.tar.gz
diff --git a/blender.spec b/blender.spec
index 4b19a45..0ee88bb 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,12 +1,14 @@
-%global blenderlib  %{_datadir}/blender/%{version}
-%global blenderarch %{_libdir}/blender/%{version}
+%global blender_api 2.57
+
+%global blenderlib  %{_datadir}/blender/%{blender_api}
+%global blenderarch %{_libdir}/blender/%{belnder_api}
 %global __python %{__python3}
 
 %global fontname blender
 
 Name:           blender
 Epoch:		1
-Version:        2.57
+Version:        2.57b
 Release: 	1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
@@ -222,7 +224,7 @@ install -p -D -m 644 doc/manpage/blender.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 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
 
 %clean
@@ -265,6 +267,9 @@ fi || :
 %{_sysconfdir}/rpm/macros.blender
 
 %changelog
+* Tue May 17 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.57b-1
+- Minor upstream update
+
 * 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 --git a/macros.blender b/macros.blender
index 88f941a..70865a6 100644
--- a/macros.blender
+++ b/macros.blender
@@ -1,4 +1,4 @@
-%blender_version @VERSION@
+y%blender_version @VERSION@
 
 %blender_libdir %{_datadir}/blender/%{blender_version}
 %blender_archdir %{_libdir}/blender/%{blender_version}
diff --git a/sources b/sources
index caad910..0e107fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6cb5523323a71c070051e6fe6efe497  blender-2.57.tar.gz
+d5f1083d39545686fe8ec8480546ec3f  blender-2.57b.tar.gz


More information about the scm-commits mailing list