rpms/blender/FC-6 blender-2.44-scons.patch, NONE, 1.1 blender.spec, 1.37, 1.38 sources, 1.11, 1.12 blender-2.42-scons.patch, 1.2, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Wed May 23 15:00:26 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/blender/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17718
Modified Files:
blender.spec sources
Added Files:
blender-2.44-scons.patch
Removed Files:
blender-2.42-scons.patch
Log Message:
New upstream version
blender-2.44-scons.patch:
--- NEW FILE blender-2.44-scons.patch ---
--- blender-2.44/SConstruct.orig 2007-05-07 18:09:40.000000000 +0200
+++ blender-2.44/SConstruct 2007-05-20 22:52:13.000000000 +0200
@@ -237,7 +242,7 @@
def CheckFreeAlut(context,env):
context.Message( B.bc.OKGREEN + "Linux platform detected:\n checking for FreeAlut... " + B.bc.ENDC )
- env['LIBS'] = 'alut'
+ env['LIBS'] = ['alut', 'openal']
result = context.TryLink(mylib_test_source_file, '.c')
context.Result(result)
return result
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-6/blender.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- blender.spec 15 May 2007 15:26:35 -0000 1.37
+++ blender.spec 23 May 2007 14:59:51 -0000 1.38
@@ -1,9 +1,10 @@
%define blenderlib %{_datadir}/blender
%define plugins %{_libdir}/blender/plugins
+%define pyver %(%{__python} -c "import sys ; print sys.version[:3]")
Name: blender
-Version: 2.42a
-Release: 24%{?dist}
+Version: 2.44
+Release: 4%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -15,17 +16,17 @@
# wget http://download.blender.org/source/blender-%{version}.tar.gz
# tar -zxv blender-%{version}.tar.gz
# rm -rf blender-%{version}/extern/ffmpeg
-# tar -zcf blender-%{version}.tar.gz blender-%{version}/
-Source0: blender-%{version}.tar.gz
+# tar -zcf blender-%{version}-noffmpeg.tar.gz blender-%{version}/
+Source0: blender-%{version}-noffmpeg.tar.gz
Source1: http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
Source2: http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
Source3: blender.png
Source4: blender.desktop
Source5: blender.xml
Source6: blender-wrapper
-Source7: blender-2.42.config
+Source7: blender-2.44.config
-Patch1: blender-2.42-scons.patch
+Patch1: blender-2.44-scons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,13 +53,13 @@
buildRequires: freetype-devel
BuildRequires: OpenEXR-devel
+Requires: python-abi = %{pyver}
+
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info
-ExcludeArch: x86_64
-
%description
Blender is the essential software solution you need for 3D, from modeling,
animation, rendering and post-production to interactive creation and playback.
@@ -68,10 +69,11 @@
%prep
%setup -q
-%patch1 -p1
+%patch1 -p1 -b .org
+sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
+ <%{SOURCE7} >user-config.py
%build
-cp %{SOURCE7} user-config.py
#
# Don't use $RPM_OPT_FLAGS (see #199418)
@@ -126,8 +128,6 @@
install -p -D -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
-rm -rf ${RPM_bUILD_ROOT}/%{blenderlib}/scripts/kmz_ImportWithMesh.*
-
#
# Install plugins
#
@@ -170,14 +170,53 @@
%{_datadir}/mime/packages/blender.xml
%changelog
+* Mon May 21 2007 Jochen Schmitt <Jochen herr-schmitt de> - 2.44-4
+- Use of $$RPM_OPT_FLAGS to compile blender
+
+* Sun May 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-2
+- Increase release number
+
+* Tue May 15 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-1
+- New upstream release
+
* Wed May 9 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-24
- Remove ffmpeg lib during a legal issue (#239476)
+* Tue May 8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-23
+- Exclude ppc64 arch
+
* Mon May 7 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-21
- Fix security issue (#239338)
* Sun Apr 22 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-20
-- Remove the package from the x86_64 arch (#237423)
+- Romove package from the x86_64 arch (#237423)
+
+* Mon Jan 8 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-18
+- Rebult
+
+* Thu Dec 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-17
+- Replace x86-patch with one from the blender project
+
+* Thu Dec 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-16
+- Rebuild
+
+* Tue Dec 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-12
+- Fix typo
+
+* Tue Dec 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-11
+- Try x64-patch for complle with python-2.5
+
+* Tue Dec 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-10
+- Exclude x86_64 arch (#219329)
+
+* Mon Dec 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-9
+- New build to solve broken deps
+
+* Wed Nov 29 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-6
+- Rebuild to solve broken deps
+
+* Tue Oct 31 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-5
+- Rebuilt to fix broken deps
* Mon Oct 16 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-4
- /usr/lib/blender should own by the package
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 15 May 2007 15:26:35 -0000 1.11
+++ sources 23 May 2007 14:59:51 -0000 1.12
@@ -1 +1 @@
-0743395066be7e02c946cdfeb2049ed1 blender-2.42a.tar.gz
+c078195e1563bb95b7b228f3f679c48d blender-2.44-noffmpeg.tar.gz
--- blender-2.42-scons.patch DELETED ---
More information about the fedora-extras-commits
mailing list