packages: blender/blender-po_and_locale_names.patch, blender/blender.spec, ...

[arekm]

Author: arekm                        Date: Sun Sep 13 12:07:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.49b

---- Files affected:
packages/blender:
   blender-po_and_locale_names.patch (1.7 -> 1.8) , blender.spec (1.92 -> 1.93) , blender-ffmpeg.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/blender/blender-po_and_locale_names.patch
diff -u packages/blender/blender-po_and_locale_names.patch:1.7 packages/blender/blender-po_and_locale_names.patch:1.8
--- packages/blender/blender-po_and_locale_names.patch:1.7	Sat Oct 18 21:55:25 2008
+++ packages/blender/blender-po_and_locale_names.patch	Sun Sep 13 14:07:33 2009
@@ -20,27 +20,6 @@
  
  ###########################################################
  ###
-diff -urN blender-2.46/po/de.po blender-2.46.new/po/de.po
---- blender-2.46/po/de.po	2008-05-19 16:40:14.000000000 +0200
-+++ blender-2.46.new/po/de.po	2008-05-30 22:11:28.000000000 +0200
-@@ -1,6 +1,16 @@
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts <snutlix at hotmail.com>, 2003.
--#
-+# translation to German
-+msgid ""
-+msgstr ""
-+""
-+"Last-Translator: UNKNOWN\n"
-+"PO-Revision-Date: 2003-04-19 21:47+0200\n"
-+"Project-Id-Version: blender 2.32\n"
-+"Language-Team: German\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- ###########################################################
- ###
 diff -urN blender-2.46/po/es.po blender-2.46.new/po/es.po
 --- blender-2.46/po/es.po	2008-05-19 16:40:14.000000000 +0200
 +++ blender-2.46.new/po/es.po	2008-05-30 22:11:26.000000000 +0200
@@ -190,11 +169,7 @@
 diff -urN blender-2.46/po/ja.po blender-2.46.new/po/ja.po
 --- blender-2.46/po/ja.po	2008-05-19 16:40:14.000000000 +0200
 +++ blender-2.46.new/po/ja.po	2008-05-30 22:27:57.000000000 +0200
-@@ -1,7 +1,18 @@
- # blender ja.po
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # snts <snutlix at hotmail.com>, 2003.
--#
+@@ -1,3 +1,15 @@
 +# translation to Japanese
 +msgid ""
 +msgstr ""
@@ -207,9 +182,9 @@
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- 
- ###########################################################
- ###
+ ### System ###
+ msgid " OK? "
+ msgstr ""
 diff -urN blender-2.46/po/Makefile blender-2.46.new/po/Makefile
 --- blender-2.46/po/Makefile	2008-05-19 16:40:14.000000000 +0200
 +++ blender-2.46.new/po/Makefile	2008-05-31 10:39:31.000000000 +0200

================================================================
Index: packages/blender/blender.spec
diff -u packages/blender/blender.spec:1.92 packages/blender/blender.spec:1.93
--- packages/blender/blender.spec:1.92	Mon Aug 17 08:44:49 2009
+++ packages/blender/blender.spec	Sun Sep 13 14:07:33 2009
@@ -5,19 +5,18 @@
 Summary:	3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):	Pakiet do tworzenia animacji 3D oraz gier
 Name:		blender
-Version:	2.48a
-Release:	4
+Version:	2.49b
+Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://download.blender.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	055d68d244458e9e429e4e492fc9b4ad
+# Source0-md5:	718eef6a4ff377989e829b92a886cc5b
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source4:	%{name}-wrapper
 Source5:	%{name}.manpage
 Patch0:		%{name}-po_and_locale_names.patch
 Patch1:		%{name}-noxml-yafray.patch
-Patch2:		%{name}-ffmpeg.patch
 URL:		http://www.blender.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenEXR-devel
@@ -64,7 +63,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 rm -f missing
 rm -f user-config.py
@@ -85,7 +83,7 @@
 BF_FFMPEG         = '%{_prefix}'
 BF_FFMPEG_INC     = '%{_includedir}/ffmpeg'
 BF_FFMPEG_LIBPATH = '%{_libdir}'
-BF_FFMPEG_LIB     = 'avformat avcodec swscale avutil'
+BF_FFMPEG_LIB     = 'avformat avcodec avdevice swscale avutil'
 
 LCGDIR            = 'lib/linux2'
 BF_BUILDDIR       = 'build/linux2'
@@ -94,7 +92,10 @@
 
 %build
 %scons BF_OPENGL_LIBPATH=%{_x_libraries}
-%{__make} -C po OCGDIR=..
+%{__make} -C po \
+	OCGDIR=.. \
+	SRCHOME=$(pwd)/source \
+	NANBLENDERHOME=$(pwd)
 
 install -d release/plugins/include
 install source/blender/blenpluginapi/*.h release/plugins/include
@@ -152,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2009/09/13 12:07:33  arekm
+- up to 2.49b
+
 Revision 1.92  2009/08/17 06:44:49  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/blender/blender-po_and_locale_names.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/blender/blender.spec?r1=1.92&r2=1.93&f=u