[blender] New upstream release Add OpenImageIO-devel as a BR Package cleanup
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Dec 14 19:29:22 UTC 2011
commit 7b762f16f56bb3526c6bb81fe43ecd2a724612ea
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Dec 14 20:29:18 2011 +0100
New upstream release
Add OpenImageIO-devel as a BR
Package cleanup
.gitignore | 1 +
blender-2.60-syspath.patch | 67 --------------------------------------------
blender-2.61-syspath.patch | 51 +++++++++++++++++++++++++++++++++
blender.spec | 25 ++++++++--------
sources | 2 +-
5 files changed, 65 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98c1c2b..f420bcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ blender-2.49b-repack.tar.bz2
/blender-2.59.tar.gz
/blender-2.60.tar.gz
/blender-2.60a.tar.gz
+/blender-2.61.tar.gz
diff --git a/blender-2.61-syspath.patch b/blender-2.61-syspath.patch
new file mode 100644
index 0000000..f9cc0fa
--- /dev/null
+++ b/blender-2.61-syspath.patch
@@ -0,0 +1,51 @@
+diff -up blender-2.61/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.61/source/blender/blenfont/intern/blf_lang.c
+--- blender-2.61/source/blender/blenfont/intern/blf_lang.c.syspath 2011-12-13 20:51:08.000000000 +0100
++++ blender-2.61/source/blender/blenfont/intern/blf_lang.c 2011-12-14 19:45:05.695753793 +0100
+@@ -101,7 +101,7 @@ static const char *locales[] = {
+
+ void BLF_lang_init(void)
+ {
+- char *messagepath= BLI_get_folder(BLENDER_DATAFILES, "locale");
++ char *messagepath = "/usr/share/local";
+
+ BLI_strncpy(global_encoding_name, SYSTEM_ENCODING_DEFAULT, sizeof(global_encoding_name));
+
+diff -up blender-2.61/source/blender/blenlib/intern/path_util.c.syspath blender-2.61/source/blender/blenlib/intern/path_util.c
+--- blender-2.61/source/blender/blenlib/intern/path_util.c.syspath 2011-12-13 20:51:07.000000000 +0100
++++ blender-2.61/source/blender/blenlib/intern/path_util.c 2011-12-14 19:48:04.557027766 +0100
+@@ -982,35 +982,6 @@ static int get_path_system(char *targetp
+ const char *system_base_path;
+
+
+- /* first allow developer only overrides to the system path
+- * these are only used when running blender from source */
+- char cwd[FILE_MAX];
+- char relfolder[FILE_MAX];
+-
+- if(folder_name) {
+- if (subfolder_name) {
+- BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
+- } else {
+- BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
+- }
+- }
+- else {
+- relfolder[0]= '\0';
+- }
+-
+- /* try CWD/release/folder_name */
+- if(BLI_current_working_dir(cwd, sizeof(cwd))) {
+- if(test_path(targetpath, cwd, "release", relfolder)) {
+- return 1;
+- }
+- }
+-
+- /* try EXECUTABLE_DIR/release/folder_name */
+- if(test_path(targetpath, bprogdir, "release", relfolder))
+- return 1;
+- /* end developer overrides */
+-
+-
+
+ system_path[0] = '\0';
+
diff --git a/blender.spec b/blender.spec
index dda0788..b27d632 100644
--- a/blender.spec
+++ b/blender.spec
@@ -1,4 +1,4 @@
-%global blender_api 2.60
+%global blender_api 2.61
# [Fedora] Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -11,8 +11,8 @@
Name: blender
Epoch: 1
-Version: 2.60a
-Release: 8%{?dist}
+Version: 2.61
+Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -27,7 +27,7 @@ Source5: blender.xml
Source10: macros.blender
Patch1: blender-2.44-bid.patch
-Patch2: blender-2.60-syspath.patch
+Patch2: blender-2.61-syspath.patch
Patch4: blender-2.48-undefine-operation.patch
Patch5: blender-2.50-uninit-var.patch
@@ -35,8 +35,6 @@ Patch6: blender-2.56-gcc46.patch
Patch10: blender-2.58-python_include.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libtool
@@ -77,6 +75,7 @@ BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
+BuildRequires: OpenImageIO-devel
# Audio stuff
BuildRequires: libsamplerate-devel
@@ -186,8 +185,6 @@ chmod +x release/plugins/bmake
make -C release/plugins/
%install
-rm -rf ${RPM_BUILD_ROOT}
-
install -D -m 755 cmake-make/bin/blender ${RPM_BUILD_ROOT}%{_bindir}/blender
install -D -m 755 cmake-make/bin/blenderplayer ${RPM_BUILD_ROOT}%{_bindir}/blenderplayer
@@ -210,9 +207,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{blenderarch}/{scripts,plugins/sequence,plugins/textu
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
-find release/bin/.blender/locale -name '.svn' -exec rm -f {} ';'
+find release/datafiles/locale -name '.svn' -exec rm -f {} ';'
-cp -a release/bin/.blender/locale ${RPM_BUILD_ROOT}%{_datadir}
+cp -a release/datafiles/locale ${RPM_BUILD_ROOT}%{_datadir}
cp -R -a -p release/scripts/* ${RPM_BUILD_ROOT}%{blenderlib}/scripts
@@ -257,9 +254,6 @@ sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
%find_lang %{name}
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%post
%{_bindir}/update-mime-database %{_datadir}/mime
touch --no-create %{_datadir}/icons/hicolor
@@ -298,6 +292,11 @@ fi || :
%{_sysconfdir}/rpm/macros.blender
%changelog
+* Wed Dec 14 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.61-1
+- New upstream release
+- Add OpenImageIO-devel as a BR
+- Package cleanup
+
* Wed Nov 23 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.60a-8
- Set BuildArch to noarch for blender-rpm-macros
diff --git a/sources b/sources
index a65216f..00457bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc7e4a56c9f7941c33c958ff0338f9a6 blender-2.60a.tar.gz
+11a4721ff92286f678bb2e05e5f29c97 blender-2.61.tar.gz
More information about the scm-commits
mailing list