Author: ghibo
Date: Wed Feb 14 18:23:37 2007
New Revision: 121095
Added:
packages/cooker/blender/current/SOURCES/blender-2.43-cvs20070214.tar.bz2
(contents, props changed)
packages/cooker/blender/current/SOURCES/blendernodri-16x16.png (contents,
props changed)
packages/cooker/blender/current/SOURCES/blendernodri-32x32.png (contents,
props changed)
packages/cooker/blender/current/SOURCES/blendernodri-48x48.png (contents,
props changed)
packages/cooker/blender/current/SOURCES/test243.zip (contents, props
changed)
Removed:
packages/cooker/blender/current/SOURCES/blender-2.43-cvs20070207.tar.bz2
packages/cooker/blender/current/SOURCES/blender-2.43-rc3-avclose.patch
packages/cooker/blender/current/SOURCES/icons-blendernodri.tar.bz2
packages/cooker/blender/current/SOURCES/test242.zip
Modified:
packages/cooker/blender/current/SPECS/blender.spec
Log:
- 2.43-20070214 (>RC3).
- use %%{name} macro to allow future build with version in name.
Added: packages/cooker/blender/current/SOURCES/blender-2.43-cvs20070214.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/blender/current/SOURCES/blendernodri-16x16.png
==============================================================================
Binary file. No diff available.
Added: packages/cooker/blender/current/SOURCES/blendernodri-32x32.png
==============================================================================
Binary file. No diff available.
Added: packages/cooker/blender/current/SOURCES/blendernodri-48x48.png
==============================================================================
Binary file. No diff available.
Added: packages/cooker/blender/current/SOURCES/test243.zip
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/blender/current/SPECS/blender.spec
==============================================================================
--- packages/cooker/blender/current/SPECS/blender.spec (original)
+++ packages/cooker/blender/current/SPECS/blender.spec Wed Feb 14 18:23:37 2007
@@ -1,4 +1,6 @@
-%define testver 242
+%define testver 243
+%define name blender
+%define truename blender
%define build_debug 0
%{?_with_debug: %{expand: %%global build_debug 1}}
@@ -8,20 +10,22 @@
%{?_with_fullopt: %{expand: %%global build_fullopt 1}}
%{?_without_fullopt: %{expand: %%global build_fullopt 0}}
-%define cvssnap 20070207
+%define cvssnap 20070214
-Name: blender
+Name: %{name}
Version: 2.43
-Release: 0.%{cvssnap}.%mkrel 2
+Release: 0.%{cvssnap}.%mkrel 1
Summary: A fully functional 3D modeling/rendering/animation package
Group: Graphics
Source0:
http://download.blender.org/source/blender-%{version}-cvs%{cvssnap}.tar.bz2
Source1: blender-wrapper
Source2: http://download.blender.org/demo/test/test%{testver}.zip
-Source11: %{name}-16x16.png
-Source12: %{name}-32x32.png
-Source13: %{name}-48x48.png
-Source14: icons-%{name}nodri.tar.bz2
+Source11: blender-16x16.png
+Source12: blender-32x32.png
+Source13: blender-48x48.png
+Source14: blendernodri-16x16.png
+Source15: blendernodri-32x32.png
+Source16: blendernodri-48x48.png
Patch0: blender-2.41-openal-fix.patch
Patch1: blender-2.42-buildfix.patch
Patch2: blender-2.43-lib64.patch
@@ -36,7 +40,6 @@
Patch13: blender-2.43-python25.patch
Patch14: blender-2.43-alut.patch
Patch15: blender-2.43-64bit_politically_correct.patch
-Patch16: blender-2.43-rc3-avclose.patch
URL: http://www.blender.org/
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -107,7 +110,6 @@
%patch14 -p1 -b .alut
%endif
%patch15 -p1 -b .softcomment
-%patch16 -p1 -b .imgbro
# Fix pt_BR
sed -i "s,pt_br,pt_BR,g" bin/.blender/.Blanguages
@@ -193,6 +195,8 @@
rm -rf %{buildroot}
install -m 755 %{SOURCE1} blender-wrapper
+perl -pi -e '[EMAIL PROTECTED]/%{truename}/@\$\{BLENDER_LIBDIR\}/%{name}/@g'
blender-wrapper
+
%ifarch %{ix86}
cat >> blender-wrapper <<EOF
if [ -e /proc/cpuinfo ]; then
@@ -200,14 +204,14 @@
fi
if [ "x\$SSE" == x ]; then
- \${BLENDER_LIBDIR}/blender/blender "\$@"
+ \${BLENDER_LIBDIR}/%{name}/%{truename} "\$@"
else
- \${BLENDER_LIBDIR}/blender/blender.sse "\$@"
+ \${BLENDER_LIBDIR}/%{name}/%{truename}.sse "\$@"
fi
EOF
%else
cat >> blender-wrapper <<EOF
-\${BLENDER_LIBDIR}/blender/blender "\$@"
+\${BLENDER_LIBDIR}/%{name}/%{truename} "\$@"
EOF
%endif
@@ -216,18 +220,18 @@
%{buildroot}%{_libdir}/%{name} \
%{buildroot}%{_datadir}
-install -m 755 ./installdir/blenderplayer %{buildroot}%{_libdir}/%{name}
-ln -s %{_libdir}/%{name}/blenderplayer %{buildroot}%{_bindir}/blenderplayer
-install -m 755 ./installdir/blender %{buildroot}%{_libdir}/%{name}
+install -m 755 ./installdir/blenderplayer
%{buildroot}%{_libdir}/%{name}/%{truename}player
+ln -s %{_libdir}/%{name}/%{truename}player %{buildroot}%{_bindir}/%{name}player
+install -m 755 ./installdir/blender %{buildroot}%{_libdir}/%{name}/%{truename}
%ifarch %{ix86}
-install -m 755 ./blender.sse %{buildroot}%{_libdir}/%{name}
+install -m 755 ./blender.sse %{buildroot}%{_libdir}/%{name}/%{truename}.sse
%endif
install -m 755 blender-wrapper %{buildroot}%{_bindir}/%{name}
-sed -i "s,SPECDEFINED,%_libdir,g" %{buildroot}%{_bindir}/blender
%{buildroot}%{_bindir}/%{name}
-cp -p %{buildroot}%{_bindir}/blender %{buildroot}%{_bindir}/%{name}nodri
-perl -pi -e '[EMAIL PROTECTED]/blender/[EMAIL PROTECTED]
\$\{BLENDER_LIBDIR\}/blender/[EMAIL PROTECTED]'
%{buildroot}%{_bindir}/%{name}nodri
+sed -i "s,SPECDEFINED,%_libdir,g" %{buildroot}%{_bindir}/%{name}
%{buildroot}%{_bindir}/%{name}
+cp -p %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}nodri
+perl -pi -e '[EMAIL PROTECTED]/%{name}/[EMAIL PROTECTED]
\$\{BLENDER_LIBDIR\}/%{name}/[EMAIL PROTECTED]'
%{buildroot}%{_bindir}/%{name}nodri
cp -a ./installdir/.blender/scripts %{buildroot}%{_libdir}/%{name}
-cp -a ./installdir/.blender/locale %{buildroot}%{_datadir}
+#cp -a ./installdir/.blender/locale %{buildroot}%{_datadir}
install -p -m 644 ./installdir/.blender/.Blanguages
%{buildroot}%{_libdir}/%{name}
install -p -m 644 ./installdir/.blender/.bfont.ttf
%{buildroot}%{_libdir}/%{name}
install -p -m 644 release/VERSION %{buildroot}%{_libdir}/%{name}
@@ -291,6 +295,7 @@
Type=Application
Categories=X-MandrivaLinux-Multimedia-Graphics;Graphics/Photography/3DGraphics;Graphics;Viewer;
MimeType=application/x-blender;
+InitialPreference=11
EOF
cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-%{name}fs.desktop << EOF
@@ -303,6 +308,7 @@
Type=Application
Categories=X-MandrivaLinux-Multimedia-Graphics;Graphics/Photography/3DGraphics;Graphics;Viewer;
MimeType=application/x-blender;
+InitialPreference=10
EOF
cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-%{name}nodri.desktop <<
EOF
@@ -321,7 +327,9 @@
install -m644 %{SOURCE11} -D %{buildroot}%{_miconsdir}/%{name}.png
install -m644 %{SOURCE12} -D %{buildroot}%{_iconsdir}/%{name}.png
install -m644 %{SOURCE13} -D %{buildroot}%{_liconsdir}/%{name}.png
-tar xjf %{SOURCE14} -C %{buildroot}%{_iconsdir}
+install -m644 %{SOURCE14} -D %{buildroot}%{_miconsdir}/%{name}nodri.png
+install -m644 %{SOURCE15} -D %{buildroot}%{_iconsdir}/%{name}nodri.png
+install -m644 %{SOURCE16} -D %{buildroot}%{_liconsdir}/%{name}nodri.png
%if %build_debug
export DONT_STRIP=1
@@ -350,15 +358,15 @@
%if %{mdkversion} >= 200610
%{_datadir}/applications/*
%endif
-%{_datadir}/locale/*
+#%{_datadir}/locale/*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/%{name}
+%{_libdir}/%{name}/%{truename}
%ifarch %{ix86}
-%{_libdir}/%{name}/%{name}.sse
+%{_libdir}/%{name}/%{truename}.sse
%endif
-%{_libdir}/%{name}/blenderplayer
+%{_libdir}/%{name}/%{truename}player
%{_libdir}/%{name}/.bfont.ttf
%{_libdir}/%{name}/.Blanguages
%{_libdir}/%{name}/VERSION
