[ogre] Update to 1.7
Bruno Wolff III
bruno at fedoraproject.org
Sun Jan 2 05:34:19 UTC 2011
commit d9206dd427f9e42082160fa80a2023cd8250a4f3
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jan 1 23:27:15 2011 -0600
Update to 1.7
.gitignore | 1 +
ogre-1.2.1-rpath.patch | 24 -----
ogre-1.6.0-system-glew.patch | 101 -------------------
ogre-1.6.0rc1-openexr-fix.patch | 44 ---------
ogre-1.6.1-fix-ppc-build.patch | 19 ----
ogre-1.6.4-system-tinyxml.patch | 148 ----------------------------
ogre-1.7.2-fix-pkgconfig-libdir.patch | 77 +++++++++++++++
ogre-1.7.2-fix-ppc-build.patch | 19 ++++
ogre-1.7.2-rpath.patch | 10 ++
ogre-1.7.2-system-tinyxml.patch | 27 +++++
ogre-NULL-fix-9337.patch | 13 ---
ogre-RenderQueueGroupID-doc-9196.patch | 28 ------
ogre-default-shadows-9213.patch | 13 ---
ogre-line-list-stencil-shadows-9342.patch | 24 -----
ogre-make-clean.sh | 19 +++--
ogre-modifiers-option-9283.patch | 151 -----------------------------
ogre-multiple-contexts-GL-9202.patch | 22 ----
ogre-no-empty-dropdowns-9269.patch | 17 ---
ogre-renderer-libs.patch | 13 ---
ogre-vertex-split-poses-9195.patch | 36 -------
ogre.spec | 120 ++++++++---------------
sources | 2 +-
22 files changed, 190 insertions(+), 738 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 759395b..08b6679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ogre-1.6.4-clean.tar.bz2
+/ogre-1.7.2-clean.tar.bz2
diff --git a/ogre-1.7.2-fix-pkgconfig-libdir.patch b/ogre-1.7.2-fix-pkgconfig-libdir.patch
new file mode 100644
index 0000000..ee9a2c3
--- /dev/null
+++ b/ogre-1.7.2-fix-pkgconfig-libdir.patch
@@ -0,0 +1,77 @@
+diff -up ogre-1.7.2/CMake/Templates/OGRE-Paging.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE-Paging.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-Paging.pc.in.BAD 2010-12-21 17:40:45.478242000 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-Paging.pc.in 2010-12-21 17:40:51.225241999 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+
+ Name: OGRE-Paging
+diff -up ogre-1.7.2/CMake/Templates/OGRE.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE.pc.in.BAD 2010-12-21 17:40:19.968241999 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE.pc.in 2010-12-21 17:40:31.873241999 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+ plugindir=${libdir}/OGRE
+
+diff -up ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.BAD 2010-12-21 17:41:02.368242000 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in 2010-12-21 17:41:07.937242000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+
+ Name: OGRE-PCZ
+diff -up ogre-1.7.2/CMake/Templates/OGRE-Property.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE-Property.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-Property.pc.in.BAD 2010-12-21 17:41:14.796241999 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-Property.pc.in 2010-12-21 17:41:19.865242000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+
+ Name: OGRE-Property
+diff -up ogre-1.7.2/CMake/Templates/OGRE-RTShaderSystem.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE-RTShaderSystem.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-RTShaderSystem.pc.in.BAD 2010-12-21 17:41:27.599242000 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-RTShaderSystem.pc.in 2010-12-21 17:41:33.593241999 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+
+ Name: OGRE-RTShaderSystem
+diff -up ogre-1.7.2/CMake/Templates/OGREStatic.pc.in.BAD ogre-1.7.2/CMake/Templates/OGREStatic.pc.in
+--- ogre-1.7.2/CMake/Templates/OGREStatic.pc.in.BAD 2010-12-21 17:41:45.839242000 -0500
++++ ogre-1.7.2/CMake/Templates/OGREStatic.pc.in 2010-12-21 17:41:50.988242000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+ plugindir=${libdir}/OGRE
+
+diff -up ogre-1.7.2/CMake/Templates/OGRE-Terrain.pc.in.BAD ogre-1.7.2/CMake/Templates/OGRE-Terrain.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-Terrain.pc.in.BAD 2010-12-21 17:41:55.667242000 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-Terrain.pc.in 2010-12-21 17:42:01.556241999 -0500
+@@ -1,6 +1,6 @@
+ prefix=@OGRE_PREFIX_PATH@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@OGRE_LIB_DIRECTORY@
++libdir=@OGRE_LIB_DIRECTORY@
+ includedir=${prefix}/include
+
+ Name: OGRE-Terrain
diff --git a/ogre-1.7.2-fix-ppc-build.patch b/ogre-1.7.2-fix-ppc-build.patch
new file mode 100644
index 0000000..6415f21
--- /dev/null
+++ b/ogre-1.7.2-fix-ppc-build.patch
@@ -0,0 +1,19 @@
+diff -up ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h
+--- ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc 2010-11-03 14:24:47.000000000 -0400
++++ ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h 2010-12-20 14:44:49.467800002 -0500
+@@ -1838,6 +1838,7 @@ static MLOCK_T malloc_global_mutex = PTH
+
+ /* Cope with old-style linux recursive lock initialization by adding */
+ /* skipped internal declaration from pthread.h */
++/*
+ #ifdef linux
+ #if !defined (PTHREAD_MUTEX_RECURSIVE) && defined (PTHREAD_MUTEX_RECURSIVE_NP)
+ extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
+@@ -1846,6 +1847,7 @@ extern int pthread_mutexattr_setkind_np
+ #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
+ #endif
+ #endif
++*/
+
+ static int pthread_init_lock (MLOCK_T *sl) {
+ pthread_mutexattr_t attr;
diff --git a/ogre-1.7.2-rpath.patch b/ogre-1.7.2-rpath.patch
new file mode 100644
index 0000000..05ff563
--- /dev/null
+++ b/ogre-1.7.2-rpath.patch
@@ -0,0 +1,10 @@
+diff -up ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.rpath ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in
+--- ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.rpath 2010-12-20 14:34:20.659800000 -0500
++++ ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in 2010-12-20 14:34:25.549800001 -0500
+@@ -7,5 +7,5 @@ Name: OGRE-PCZ
+ Description: Portal-Connected Zone Scene Manager for OGRE
+ Version: @OGRE_VERSION@
+ Requires: OGRE = @OGRE_VERSION@
+-Libs: ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX at Plugin_PCZSceneManager@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX at Plugin_OctreeZone@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ -Wl,-rpath,${libdir}/OGRE
++Libs: ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX at Plugin_PCZSceneManager@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX at Plugin_OctreeZone@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@
+ Cflags: -I${includedir}/OGRE/Plugins/PCZSceneManager -I${includedir}/OGRE/Plugins/OctreeZone @OGRE_CFLAGS@
diff --git a/ogre-1.7.2-system-tinyxml.patch b/ogre-1.7.2-system-tinyxml.patch
new file mode 100644
index 0000000..479a95d
--- /dev/null
+++ b/ogre-1.7.2-system-tinyxml.patch
@@ -0,0 +1,27 @@
+diff -up ogre-1.7.2/Tools/XMLConverter/CMakeLists.txt.sys-tinyxml ogre-1.7.2/Tools/XMLConverter/CMakeLists.txt
+--- ogre-1.7.2/Tools/XMLConverter/CMakeLists.txt.sys-tinyxml 2010-12-20 14:41:23.984800000 -0500
++++ ogre-1.7.2/Tools/XMLConverter/CMakeLists.txt 2010-12-20 14:43:05.264800002 -0500
+@@ -13,22 +13,16 @@ set(HEADER_FILES
+ include/OgreXMLMeshSerializer.h
+ include/OgreXMLPrerequisites.h
+ include/OgreXMLSkeletonSerializer.h
+- include/tinystr.h
+- include/tinyxml.h
+ )
+
+ set(SOURCE_FILES
+ src/main.cpp
+ src/OgreXMLMeshSerializer.cpp
+ src/OgreXMLSkeletonSerializer.cpp
+- src/tinystr.cpp
+- src/tinyxml.cpp
+- src/tinyxmlerror.cpp
+- src/tinyxmlparser.cpp
+ )
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+ add_definitions(-DTIXML_USE_STL)
+ add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES})
+-target_link_libraries(OgreXMLConverter ${OGRE_LIBRARIES})
++target_link_libraries(OgreXMLConverter ${OGRE_LIBRARIES} -ltinyxml)
+ ogre_config_tool(OgreXMLConverter)
diff --git a/ogre-make-clean.sh b/ogre-make-clean.sh
index 7cf37c9..2f78ce9 100755
--- a/ogre-make-clean.sh
+++ b/ogre-make-clean.sh
@@ -3,21 +3,21 @@
set -e
set -x
-version=1.6.4
+version=1.7.2
-[ ! -e ogre ]
+[ ! -e ogre-${version} ]
-tar xjf ogre-v$(echo ${version} | tr . -).tar.bz2
+tar xjf ogre_src_v$(echo ${version} | tr . -).tar.bz2
-cd ogre
+cd ogre_src_v$(echo ${version} | tr . -)
# - Non-free licensed headers under RenderSystems/GL/include/GL removed
rm RenderSystems/GL/include/GL/{gl,glext,glxext,glxtokens,wglext}.h
-# - GLEW sources updated to 1.5.1
+# - GLEW sources updated to 1.5.5
rpm -q glew-devel glew-debuginfo
cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/
-cp -f /usr/src/debug/glew/src/glew.c RenderSystems/GL/src/glew.cpp
+cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.cpp
dos2unix RenderSystems/GL/src/glew.cpp
# - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
@@ -26,6 +26,11 @@ rm Samples/Media/packs/chiropteraDM.{pk3,txt}
# - Non-free fonts under Samples/Media/fonts removed
rm Samples/Media/fonts/{bluebold,bluecond,bluehigh,solo5}.ttf
+# - Non-free textures under Samples/Media/materials/textures/nvidia removed
+rm Samples/Media/materials/textures/nvidia/*
+
cd ..
-tar cjf ogre-$version-clean.tar.bz2 ogre
+mv ogre_src_v$(echo ${version} | tr . -) ogre-${version}
+
+tar cjf ogre-$version-clean.tar.bz2 ogre-${version}
diff --git a/ogre.spec b/ogre.spec
index 78414b7..9c409e5 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -1,43 +1,37 @@
Name: ogre
-Version: 1.6.4
-Release: 5%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
-# LGPLv2+ with exceptions - main library
+# MIT with exceptions - main library
# CC-BY-SA - devel docs
# Freely redistributable without restriction - most of samples content
# MIT - shaders for DeferredShadingMedia samples
-License: LGPLv2+ with exceptions and CC-BY-SA and Freely redistributable without restriction and MIT
+License: MIT with exceptions and CC-BY-SA and Freely redistributable without restriction
Group: System Environment/Libraries
URL: http://www.ogre3d.org/
# This is modified http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
# with non-free files striped (see ogre-make-clean.sh):
+# Update local glew copy to 1.5.5
# - Non-free licensed headers under RenderSystems/GL/include/GL removed
-# - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 1.5.1 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
# - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
# - Non-free fonts under Samples/Media/fonts removed
+# - Non-free textures under Samples/Media/materials/textures/nvidia
Source0: %{name}-%{version}-clean.tar.bz2
Source1: ogre-samples.sh
-Patch0: ogre-1.2.1-rpath.patch
+Patch0: ogre-1.7.2-rpath.patch
#Patch1: ogre-1.6.0-system-glew.patch
# Upstream patch to GLEW applied to new version
Patch1: ogre-1.6.0rc1-glew.patch
-Patch2: ogre-1.6.4-system-tinyxml.patch
-Patch3: ogre-1.6.1-fix-ppc-build.patch
-Patch4: ogre-renderer-libs.patch
-Patch5: ogre-vertex-split-poses-9195.patch
-Patch6: ogre-RenderQueueGroupID-doc-9196.patch
-Patch7: ogre-multiple-contexts-GL-9202.patch
-Patch8: ogre-default-shadows-9213.patch
-Patch9: ogre-no-empty-dropdowns-9269.patch
-Patch10: ogre-modifiers-option-9283.patch
-Patch11: ogre-NULL-fix-9337.patch
-Patch12: ogre-line-list-stencil-shadows-9342.patch
+Patch2: ogre-1.7.2-system-tinyxml.patch
+Patch3: ogre-1.7.2-fix-ppc-build.patch
+Patch4: ogre-1.7.2-fix-pkgconfig-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cegui-devel zziplib-devel freetype-devel
BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
BuildRequires: ois-devel freeimage-devel openexr-devel
-#BuildRequires: glew-devel
+BuildRequires: glew-devel, poco-devel, tbb-devel
BuildRequires: tinyxml-devel
+BuildRequires: cmake
%description
OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
@@ -83,38 +77,26 @@ with the wrapper script called "Ogre-Samples".
%prep
-%setup -q -n ogre
+%setup -q
%patch0 -p1 -z .rpath
%patch1 -p1 -z .glew
%patch2 -p1 -z .sys-tinyxml
%patch3 -p1 -z .ppc
-%patch4 -p1
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
+%patch4 -p1 -z .pkgconfig
# remove execute bits from src-files for -debuginfo package
chmod -x `find RenderSystems/GL -type f` \
`find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
# Fix path to Media files for the Samples
-sed -i 's|../../Media|%{_datadir}/OGRE/Samples/Media|g' \
- Samples/Common/bin/resources.cfg
+# sed -i 's|../../Media|%{_datadir}/OGRE/Samples/Media|g' \
+# Samples/Common/bin/resources.cfg
# Remove spurious execute buts from some Media files
-chmod -x `find Samples/Media/DeferredShadingMedia -type f` \
- Samples/Media/overlays/Example-DynTex.overlay \
- Samples/Media/gui/TaharezLook.looknfeel \
- Samples/Media/gui/Falagard.xsd \
- Samples/Media/materials/scripts/Example-DynTex.material
+chmod -x `find Samples/Media/DeferredShadingMedia -type f`
# create a clean version of the api docs for %%doc
mkdir api
find . \( -wholename './Docs/api/html/*.html' -or \
-wholename './Docs/api/html/*.gif' -or -wholename './Docs/api/html/*.png' \
-or -wholename './Docs/api/html/*.css' \) -exec cp --target-directory='api' '{}' +
-for i in api/OgreParticleEmitter_8h-source.html \
+for i in api/OgreParticleEmitter_8h_source.html \
api/classOgre_1_1ParticleSystem.html \
api/classOgre_1_1DynLib.html \
api/classOgre_1_1ParticleEmitter.html; do
@@ -130,29 +112,17 @@ rm Tools/XMLConverter/include/tiny*
%build
-%configure --disable-cg --disable-devil --enable-openexr
-# Don't link to unneeded stuff
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-# Stop ogre from linking the GL render plugin against the system libOgre
-# instead of the just build one.
-sed -i 's|-L%{_libdir}||g' `find -name Makefile`
+mkdir build
+cd build
+%cmake .. -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 -DOGRE_LIB_DIRECTORY=%{_libdir}
make %{?_smp_mflags}
+# Build rcapsdump
+gcc %{optflags} -o rcapsdump -I./include -I../OgreMain/include/ ../Tools/rcapsdump/src/main.cpp -L./lib -lOgreMain -lstdc++
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la
-
-# These 2 not really public header files are needed for ogre4j
-install -p -m 644 \
- OgreMain/include/OgreOptimisedUtil.h \
- OgreMain/include/OgrePlatformInformation.h \
- $RPM_BUILD_ROOT%{_includedir}/OGRE
+cd build
+make DESTDIR=$RPM_BUILD_ROOT install
# Create config for ldconfig
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
@@ -160,28 +130,25 @@ echo "%{_libdir}/OGRE" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
# Install the samples
mkdir -p $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
-# The Sample binaries get installed into the buildroot in a subdir of
-# the cwd??
-mv $RPM_BUILD_ROOT`pwd`/Samples/Common/bin/* \
- $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
-for cfg in plugins.cfg media.cfg quake3settings.cfg resources.cfg; do
- install -p -m 644 Samples/Common/bin/$cfg \
+install -p -m 644 lib/Sample_*.so $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
+for cfg in plugins.cfg quakemap.cfg resources.cfg samples.cfg; do
+ install -p -m 644 inst/bin/release/$cfg \
$RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
done
sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
$RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/plugins.cfg
-# Change location of pak + switch from non-free chiropteraDM map
-sed -i 's|^Pak0Location: ../../Media/.*$|Pak0Location: %{_datadir}/OGRE/Samples/Media/packs/ogretestmap.zip|' \
- $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/quake3settings.cfg
+# Change location of archive + switch from non-free chiropteraDM map
+sed -i 's|^Archive: /usr/share/OGRE/media/packs/chiropteraDM.pk3*$|Archive: %{_datadir}/OGRE/Samples/Media/packs/ogretestmap.zip|' \
+ $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/quakemap.cfg
sed -i 's|^Map:.*$|Map: ogretestmap.bsp|' \
- $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/quake3settings.cfg
+ $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples/quakemap.cfg
# Fixing bug with wrong case for media
-mv Samples/Media/PCZAppMedia/ROOM_NY.mesh Samples/Media/PCZAppMedia/room_ny.mesh
-mv Samples/Media/PCZAppMedia/ROOM_PY.mesh Samples/Media/PCZAppMedia/room_py.mesh
+mv ../Samples/Media/PCZAppMedia/ROOM_NY.mesh ../Samples/Media/PCZAppMedia/room_ny.mesh
+mv ../Samples/Media/PCZAppMedia/ROOM_PY.mesh ../Samples/Media/PCZAppMedia/room_py.mesh
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/Ogre-Samples
mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
-cp -a Samples/Media $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
+cp -a ../Samples/Media $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
ln -s ../../../../fonts/dejavu/DejaVuSans-Bold.ttf \
$RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/bluebold.ttf
ln -s ../../../../fonts/dejavu/DejaVuSans.ttf \
@@ -191,10 +158,8 @@ ln -s ../../../../fonts/dejavu/DejaVuSansCondensed.ttf \
ln -s ../../../../fonts/dejavu/DejaVuSans.ttf \
$RPM_BUILD_ROOT%{_datadir}/OGRE/Samples/Media/fonts/solo5.ttf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+# Install rcapsdump
+install -p -m 755 rcapsdump $RPM_BUILD_ROOT%{_bindir}/
%post -p /sbin/ldconfig
@@ -207,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
%doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif
%{_bindir}/Ogre*
%{_bindir}/rcapsdump
-%{_libdir}/lib*Ogre*-%{version}.so
+%{_libdir}/lib*Ogre*.so.*
%{_libdir}/OGRE
%{_datadir}/OGRE
%exclude %{_bindir}/Ogre-Samples
@@ -217,24 +182,25 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%{_libdir}/libOgreMain.so
-%{_libdir}/libCEGUIOgreRenderer.so
+%{_libdir}/lib*Ogre*.so
%{_includedir}/OGRE
%{_libdir}/pkgconfig/*.pc
%files devel-doc
%defattr(-,root,root,-)
-%doc LINUX.DEV api Docs/manual Docs/shadows Docs/vbo-update Docs/style.css
+%doc api Docs/manual Docs/shadows Docs/vbo-update Docs/style.css
%files samples
%defattr(-,root,root)
-%doc Samples/ReadMe.html
%{_bindir}/Ogre-Samples
%{_libdir}/OGRE/Samples
%{_datadir}/OGRE/Samples
%changelog
+* Tue Dec 21 2010 Tom Callaway <spot at fedoraproject.org> - 1.7.2-1
+- move to 1.7.2
+
* Sat Nov 28 2009 Bruno Wolff III <bruno at wolff.to> - 1.6.4-5
- Get upstream fixes since 1.6.4 release. This includes a couple of crash bugs.
diff --git a/sources b/sources
index d3bf88a..853fa7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d18102768f42ab769f295241e7e2503e ogre-1.6.4-clean.tar.bz2
+fa85ce785b0184372535163a462eccc8 ogre-1.7.2-clean.tar.bz2
More information about the scm-commits
mailing list