rpms/blender/F-10 blender-repack.sh, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.16, 1.17 blender-2.49.config, 1.2, 1.3 blender-wrapper, 1.8, 1.9 blender.spec, 1.96, 1.97 sources, 1.22, 1.23 blender.desktop, 1.3, NONE blender.png, 1.1, NONE export-3ds-0.71.py, 1.1, NONE import-3ds-0.7.py, 1.1, NONE
Nicolas Chauvet
kwizart at fedoraproject.org
Fri Jun 19 14:38:23 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/blender/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15367/F-10
Modified Files:
.cvsignore blender-2.49.config blender-wrapper blender.spec
sources
Added Files:
blender-repack.sh import.log
Removed Files:
blender.desktop blender.png export-3ds-0.71.py
import-3ds-0.7.py
Log Message:
Update to 2.49a
--- NEW FILE blender-repack.sh ---
#!/bin/sh
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
BVERSION=2.49a
pushd "$tmp"
if [ -e $pwd/blender-${BVERSION}.tar.gz ] ; then
tar zxvf $pwd/blender-${BVERSION}.tar.gz
fi
pushd blender-${BVERSION}
pushd extern
#Removed because of ip
rm -rf ffmpeg libmp3lame x264 xvidcore
#Removed because we can expect to use system one
rm -rf fftw glew libopenjpeg ode qhull make verse
#Will have to be removed later: bFTGL
popd
rm -rf scons
popd
tar jcf "$pwd"/blender-${BVERSION}-repack.tar.bz2 blender-${BVERSION}
popd
--- NEW FILE import.log ---
blender-2_49a-1_fc12:F-10:blender-2.49a-1.fc12.src.rpm:1245422184
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 26 Oct 2008 19:19:05 -0000 1.16
+++ .cvsignore 19 Jun 2009 14:37:49 -0000 1.17
@@ -1 +1 @@
-blender-2.48a-noffmpeg.tar.gz
+blender-2.49a-repack.tar.bz2
Index: blender-2.49.config
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-10/blender-2.49.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blender-2.49.config 3 Jun 2009 16:32:55 -0000 1.2
+++ blender-2.49.config 19 Jun 2009 14:37:50 -0000 1.3
@@ -46,7 +46,7 @@ WITH_BF_INTERNATIONAL = 'true'
BF_GETTEXT = '/usr'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIB = 'gettextlib qhull'
BF_GETTEXT_LIBPATH = '@LIB@'
WITH_BF_FTGL = 'true'
Index: blender-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-10/blender-wrapper,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- blender-wrapper 3 Jun 2009 16:32:55 -0000 1.8
+++ blender-wrapper 19 Jun 2009 14:37:50 -0000 1.9
@@ -4,7 +4,7 @@
#
# In case user's home directory doesn't contain ~/.blender, copy it
-# from /usr/share/blender
+# from /usr/share/blender and the detected BLENDER_LIBDIR
if [ -x /usr/bin/blender-freeworld.bin ]; then
blend="blender-freeworld"
@@ -12,80 +12,82 @@ else
blend="blender"
fi
+#Set the blender binary library directory
+if [ -d ${BLENDER_LIBDIR}/plugins ]; then
+ break
+elif [ -d /usr/lib64/blender/plugins ]; then
+ BLENDER_LIBDIR=/usr/lib64/blender
+elif [ -d /usr/lib32/blender/plugins ]; then
+ BLENDER_LIBDIR=/usr/lib32/blender
+elif [ -d /usr/lib/blender/plugins ]; then
+ BLENDER_LIBDIR=/usr/lib/blender
+else
+ echo "blender binary directory was not found or BLENDER_LIBDIR is wrong"
+ exit 1
+fi
+
if [ ! -d ~/.blender ]; then
- install -d ~/.blender
+ mkdir -p ~/.blender
ln -sf /usr/share/locale ~/.blender/locale
ln -sf /usr/share/blender/.Blanguages ~/.blender
ln -sf /usr/share/blender/.bfont.ttf ~/.blender
ln -sf /usr/share/blender/VERSION ~/.blender/VERSION
- install -d ~/.blender/plugins/sequence
- install -d ~/.blender/plugins/texture
+ mkdir -p ~/.blender/plugins
- install -d ~/.blender/scripts
+ mkdir -p ~/.blender/scripts/bpydata/config
- if [ -L ~/.blender/scripts/bpydata ]; then
- rm ~/.blender/scripts/bpydata
- fi
+ ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/bpymodules
- if [ -d ~/.blender/scripts/bpydata ]; then
- mkdir -p ~/blender/scripts/bpydata
- mkdir -p ~/blender/scripts/bpydata/config
+ if [ -d ${BLENDER_LIBDIR}/plugins ]; then
+ ln -sf ${BLENDER_LIBDIR}/plugins/sequence ~/.blender/plugins/sequence
+ ln -sf ${BLENDER_LIBDIR}/plugins/texture ~/.blender/plugins/texture
fi
+fi
- ln -sf /usr/share/blender/scripts/bpymodules ~/.blender/scripts/pbymodules
- ln -sf /usr/share/blender/scripts/* ~/.blender/scripts/
-
- if [ -d /usr/lib64/blender/plugins ]; then
- ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
- fi
+if [ ! -d ~/.blender/scripts/bpydata ]; then
+ if [ -L ~/.blender/scripts/bpydata ]; then
+ rm ~/.blender/scripts/bpydata
+ fi
+ mkdir -p ~/.blender/scripts/bpydata/config
fi
+
#
# Fully update the plugins every time blender is launched.
#
for s in /usr/share/blender/scripts/bpydata/config/* ; do
- s=`basename $s`
- if [ ! -e ~/.blender/scripts/bpydata/config/$s ] ; then
- cp /usr/share/blender/scripts/bpydata/config/$s \
- ~/.blender/scripts/pbydata/config/$s
+ s=`basename ${s}`
+ if [ $? ]; then
+ break
+ fi
+ if [ ! -e ~/.blender/scripts/bpydata/config/${s} ] ; then
+ cp -p /usr/share/blender/scripts/bpydata/config/${s} \
+ ~/.blender/scripts/bpydata/config/${s}
fi
done
-for s in /usr/share/blender/scripts/*.p* ; do
- s=`basename $s`
- if [ ! -e ~/.blender/scripts/$s ] ; then
- ln -sf /usr/share/blender/scripts/$s ~/.blender/scripts/
+for s in /usr/share/blender/scripts/*.py* ; do
+ s=`basename ${s}`
+ if [ ! -e ~/.blender/scripts/${s} ] ; then
+ ln -sf /usr/share/blender/scripts/${s} ~/.blender/scripts/
fi
done
-if [ -d /usr/lib64/blender/scripts ] ; then
- for s in /usr/lib64/blender/scripts/* ; do
- s=`basename $s`
- if [ ! -e ~/.blender/scripts/$s -a -x /usr/lib64/blender/scripts/$s ] ; then
- ln -sf /usr/lib64/blender/scripts/$s ~/.blender/scripts/
- fi
- done
-elif [ -d /usr/lib/blender/scripts ] ; then
- for s in /usr/lib/blender/scripts/* ; do
- s=`basename $s`
- if [ ! -e ~/.blender/scripts/$s -a -x /usr/lib/blender/scripts/$s ] ; then
- ln -sf /usr/lib/blender/scripts/$s ~/.blender/scripts/
+if [ -d ${BLENDER_LIBDIR}/scripts ] ; then
+ for s in ${BLENDER_LIBDIR}/blender/scripts/*.{py*,so} ; do
+ s=`basename ${s}`
+ if [ $? ]; then
+ break
+ fi
+ if [ ! -e ~/.blender/scripts/${s} ] ; then
+ ln -sf ${BLENDER_LIBDIR}/scripts/${s} ~/.blender/scripts/
fi
done
fi
-if [ -d /usr/lib64/blender/plugins ]; then
- ln -sf /usr/lib64/blender/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib64/blender/plugins/texture ~/.blender/plugins/texture
-elif [ -d /usr/lib/blender/plugins ]; then
- ln -sf /usr/lib/blender/plugins/sequence ~/.blender/plugins/sequence
- ln -sf /usr/lib/blender/plugins/texture ~/.blender/plugins/texture
-fi
-
/usr/bin/${blend}.bin $@
Index: blender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-10/blender.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- blender.spec 12 Jun 2009 15:27:03 -0000 1.96
+++ blender.spec 19 Jun 2009 14:37:52 -0000 1.97
@@ -1,33 +1,26 @@
-%global blenderlib %{_datadir}/blender
-%global plugins %{_libdir}/blender/plugins
+%global blenderlib %{_datadir}/blender
+%global blenderarch %{_libdir}/blender
%global fontname blender
Name: blender
-Version: 2.49
-Release: 5%{?dist}
+Version: 2.49a
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
Group: Applications/Multimedia
License: GPLv2
URL: http://www.blender.org
-# This is a customized source package without ffmpeg, which is
-# patent encumbered (#239476)
-# wget http://download.blender.org/source/blender-2.49.tar.gz
-# cd blender-2-47/extern
-# rm -rf ffmpeg libmp3lame x264
-# cd ../..
-# tar -zcf blender-2.49-noffmpeg.tar.gz blender-2-49/
-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
+# This is a customized source package without bundled dependencies
+# See blender-repack.sh
+Source0: blender-%{version}-repack.tar.bz2
+
Source5: blender.xml
Source6: blender-wrapper
Source7: blenderplayer-wraper
Source8: blender-2.49.config
+Source100: blender-repack.sh
Patch1: blender-2.49-scons.patch
Patch2: blender-2.44-bid.patch
@@ -58,16 +51,16 @@ BuildRequires: libXi-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-buildRequires: freetype-devel
+BuildRequires: freetype-devel
BuildRequires: OpenEXR-devel
BuildRequires: glew-devel
BuildRequires: fontpackages-devel
BuildRequires: fftw-devel
-#BuildRequires: ftgl-devel
+BuildRequires: ftgl-devel
BuildRequires: ode-devel
BuildRequires: openjpeg-devel
-#BuildRequires: qhull-devel
+BuildRequires: qhull-devel
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
@@ -87,6 +80,8 @@ Requires: dejavu-fonts
Provides: blender-fonts = %{version}-%{release}
Obsoletes: blender-fonts <= 2.48a-9
+
+
%description
Blender is the essential software solution you need for 3D, from modeling,
animation, rendering and post-production to interactive creation and playback.
@@ -94,16 +89,18 @@ animation, rendering and post-production
Professionals and novices can easily and inexpensively publish stand-alone,
secure, multi-platform content to the web, CD-ROMs, and other media.
-This version doesn't contains ffmpeg support.
+
%package -n blenderplayer
Summary: Standalone blender player
Group: Applications/Multimedia
-License: GPLv2
+
%description -n blenderplayer
This package contains a stand alone release of the blender player.
You will need this package to play games which are based on the
-Blender Geaming Engine.
+Blender Game Engine.
+
+
%prep
%setup -q
@@ -113,13 +110,6 @@ Blender Geaming Engine.
%patch100 -p1
%patch101 -p1
-#rm -rf extern/bFTGL
-rm -rf extern/fftw
-rm -rf extern/glew
-rm -rf extern/libopenjpeg
-#rm -rf extern/qhull
-rm -rf extern/ode
-rm -rf extern/xvidcore
PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
@@ -145,8 +135,6 @@ 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/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
@@ -154,85 +142,87 @@ install -D -m 755 %{SOURCE7} ${RPM_BUILD
# Install miscellanous files to /usr/lib/blender
#
-mkdir -p ${RPM_BUILD_ROOT}/%{blenderlib}
-
-pushd bin/.blender/locale
-rm -rf $(find -name '.svn' -print)
-popd
+mkdir -p ${RPM_BUILD_ROOT}%{blenderlib}/scripts
-cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
+#
+# Create empty %%{_libdir}/blender/scripts to claim ownership
+#
-install -d ${RPM_BUILD_ROOT}%{blenderlib}/scripts
+mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/texture}
-cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
+#
+# Install plugins
+#
-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 -pm 755 release/plugins/sequence/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/sequence
+install -pm 755 release/plugins/texture/*.so ${RPM_BUILD_ROOT}%{blenderarch}/plugins/texture
-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
-pushd ${RPM_BUILD_ROOT}%{blenderlib}/scripts
-find . -exec sed -i -e 's/\r$//g' {} \;
-chmod -R 0755 *
-popd
+find bin/.blender/locale -name '.svn' -exec rm -f {} ';'
+cp -a bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
-install -p -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
+cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
-install -p -D -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
+install -pm 644 release/VERSION ${RPM_BUILD_ROOT}%{blenderlib}
+install -pm 644 bin/.blender/.Blanguages ${RPM_BUILD_ROOT}%{blenderlib}
#
-# Install plugins
+# Create link to DejaVu-Sans
#
+ln -sf %{_fontbasedir}/dejavu/DejaVuSans.ttf ${RPM_BUILD_ROOT}%{blenderlib}/.bfont.ttf
+
+find ${RPM_BUILD_ROOT}%{blenderlib}/scripts -type f -exec sed -i -e 's/\r$//g' {} \;
-install -d ${RPM_BUILD_ROOT}%{plugins}/sequence
-install -d ${RPM_BUILD_ROOT}%{plugins}/texture
+# Install hicolor icons.
+for i in 16x16 22x22 32x32 ; do
+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${i}/apps
+ install -pm 0644 release/freedesktop/icons/${i}/%{name}.png \
+ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${i}/apps/%{name}.png
+done
-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 -p -D -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- %{SOURCE4}
+ release/freedesktop/blender.desktop
-#
-# Create empty %%{_libdir}/blender/scripts to claim ownership
-#
-install -d ${RPM_BUILD_ROOT}%{_libdir}/blender/scripts
-#
-# Create link to DejaVu-Sans
-#
-rm ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf
-(cd ${RPM_BUILD_ROOT}; ln -sf %{_fontbasedir}/dejavu/DejaVuSans.ttf ${RPM_BUILD_ROOT}%{_datadir}/blender/.bfont.ttf)
+%find_lang %{name}
+
-%find_lang %name
%clean
rm -rf ${RPM_BUILD_ROOT}
%post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%{_bindir}/update-mime-database %{_datadir}/mime
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+%{_bindir}/update-desktop-database %{_datadir}/applications || :
%postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%{_bindir}/update-mime-database %{_datadir}/mime
+%{_bindir}/update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi || :
-%files -f %name.lang
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README doc/python-dev-guide.txt doc/GPL-license.txt doc/bf-members.txt
%{_bindir}/blender
%{_bindir}/blender.bin
%{_datadir}/applications/fedora-blender.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{blenderlib}/
-%{_libdir}/blender/
+%{blenderarch}/
%{_datadir}/mime/packages/blender.xml
%files -n blenderplayer
@@ -242,9 +232,19 @@ update-desktop-database %{_datadir}/appl
%{_bindir}/blenderplayer.bin
%changelog
+* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49a-1
+- Update to 2.49a
+
+* Fri Jun 19 2009 kwizart < kwizart at gmail.com > - 2.49-6
+- Update blender-wrapper script.
+- Repackage the sources archive.
+- Remove deprecated import/export-3ds-0.7.py
+- Pick desktop and icons from tarball and use hicolor icons.
+- Hack config.py to add system libqhull along with gettexlib.
+
* Fri Jun 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-5
- Fix Type
-- Chage symlint to %%{_fontbasedir}/Dajavu/...
+- Change symlink to %%{_fontbasedir}/Dejavu/...
* Wed Jun 3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-4
- Rework on the blender wrapper script
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/blender/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 2 Jun 2009 15:40:12 -0000 1.22
+++ sources 19 Jun 2009 14:37:53 -0000 1.23
@@ -1 +1 @@
-a92a6bfb22e5eb50e4499aa770cb7b52 blender-2.49-noffmpeg.tar.gz
+827f8faeb622b758e01920fabd115598 blender-2.49a-repack.tar.bz2
--- blender.desktop DELETED ---
--- export-3ds-0.71.py DELETED ---
--- import-3ds-0.7.py DELETED ---
More information about the fedora-extras-commits
mailing list