rpms/blender/devel blender.spec,1.107,1.108 sources,1.21,1.22

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10254

Modified Files:
	blender.spec sources 
Log Message:
Remove x264 from source tar ball


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- blender.spec	1 Apr 2009 16:45:52 -0000	1.107
+++ blender.spec	20 Apr 2009 16:48:09 -0000	1.108
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	19%{?dist}
+Release: 	20%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -16,7 +16,7 @@
 # patent encumbered (#239476)
 # wget http://download.blender.org/source/blender-2.48.tar.gz
 # cd blender-2-47/extern
-# rm -rf ffmpeg libmp3lame
+# rm -rf ffmpeg libmp3lame x264
 # cd ../..
 # tar -zcf blender-2.48-noffmpeg.tar.gz blender-2-48/
 Source0:	blender-%{version}-noffmpeg.tar.gz
@@ -127,13 +127,13 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}/%{_bindir}/blender.bin
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer.bin
+install -D -m 755 build/linux2/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender.bin
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer.bin
 
-install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 build/linux2/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
-install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/%{_bindir}/blender
-install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}/%{_bindir}/blenderplayer
+install -D -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}%{_bindir}/blender
+install -D -m 755 %{SOURCE7} ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
 
 #
 #  Install miscellanous files to /usr/lib/blender
@@ -145,15 +145,15 @@
 rm -rf $(find -name '.svn' -print)
 popd
 
-cp -a bin/.blender/locale ${RPM_BUILD_ROOT}/%{_datadir}
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
 
-install -d ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+install -d ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}/%{blenderlib}/scripts
+cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
 
-install -m 644 release/VERSION ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}/%{blenderlib}
-install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}/%{blenderlib}
+install -m 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
+install -m 644 bin/.blender/.bfont.ttf ${RPM_BUILD_ROOT}%{blenderlib}
 
 install -p -D -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/import-3ds-0.7.py
 install -p -D -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{blenderlib}/scripts/export-3ds-0.71.py
@@ -172,11 +172,11 @@
 # Install plugins
 #
 
-install -d ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -d ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -d ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -d ${RPM_BUILD_ROOT}%{plugins}/texture
 
-install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}/%{plugins}/sequence
-install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}/%{plugins}/texture
+install -s -m 644 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{plugins}/sequence
+install -s -m 644 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{plugins}/texture
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -191,8 +191,8 @@
 #
 # Create link to DejaVu-Sans
 #
-rm ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf
-(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}/%{_datadir}/blender/.bfont.ttf)
+rm ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf
+(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontdir}/dejavu/DejaVuSans.tt ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf)
 
 %find_lang %name
 
@@ -227,7 +227,11 @@
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.48a-19
+* Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-20
+- Remove x264 from source tar ball
+- Some cosmetic changes
+
+* Wed Apr  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-19
 - Change nonfree to freeworld
 
 * Tue Mar 31 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.48a-18


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	26 Oct 2008 19:19:05 -0000	1.21
+++ sources	20 Apr 2009 16:48:09 -0000	1.22
@@ -1 +1 @@
-ede2f9466b62e980f9ef87925e463976  blender-2.48a-noffmpeg.tar.gz
+cac955e60dc8e36113dfda3c068b661a  blender-2.48a-noffmpeg.tar.gz