From fe55a85130a354ec691bbb0ea03a3a78f995bda1 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jul 01 2007 20:26:43 +0000 Subject: - New upstream release 1.4.2 - Warning as always with a new upstream ogre release this breaks the ABI and changes the soname! - Warning this release also breaks the API! --- diff --git a/.cvsignore b/.cvsignore index c7a97d6..720bc5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ogre-linux_osx-v1-2-5.tar.bz2 +ogre-linux-osx-v1-4-2.tar.bz2 diff --git a/ogre-1.2.1-rpath.patch b/ogre-1.2.1-rpath.patch index 65a2624..c56f74e 100644 --- a/ogre-1.2.1-rpath.patch +++ b/ogre-1.2.1-rpath.patch @@ -1,21 +1,24 @@ ---- ogrenew/OgreMain/src/Makefile.in~ 2006-06-15 23:31:11.000000000 +0200 -+++ ogrenew/OgreMain/src/Makefile.in 2006-06-15 23:31:11.000000000 +0200 -@@ -452,7 +452,7 @@ - OgreCompiler2Pass.cpp $(am__append_1) - platformdir = $(libdir) - libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) --libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir) -+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ - all: all-am - - .SUFFIXES: ---- ogrenew/OgreMain/src/Makefile.am~ 2006-06-15 23:31:02.000000000 +0200 -+++ ogrenew/OgreMain/src/Makefile.am 2006-06-15 23:31:02.000000000 +0200 -@@ -174,6 +174,6 @@ +diff -up ogrenew/OgreMain/src/Makefile.am~ ogrenew/OgreMain/src/Makefile.am +--- ogrenew/OgreMain/src/Makefile.am~ 2007-06-30 21:18:34.000000000 +0200 ++++ ogrenew/OgreMain/src/Makefile.am 2007-06-30 21:18:34.000000000 +0200 +@@ -185,7 +185,7 @@ endif platformdir = $(libdir) - libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) --libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir) -+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ + libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS) +-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir) ++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ + #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir) #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map +diff -up ogrenew/OgreMain/src/Makefile.in~ ogrenew/OgreMain/src/Makefile.in +--- ogrenew/OgreMain/src/Makefile.in~ 2007-06-30 21:19:23.000000000 +0200 ++++ ogrenew/OgreMain/src/Makefile.in 2007-06-30 21:19:23.000000000 +0200 +@@ -488,7 +488,7 @@ platformdir = $(libdir) + libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) \ + $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS) \ + $(am__append_3) +-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir) ++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ + all: all-am + + .SUFFIXES: diff --git a/ogre-1.2.2-soname.patch b/ogre-1.2.2-soname.patch deleted file mode 100644 index 3545e7e..0000000 --- a/ogre-1.2.2-soname.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- ogrenew/OgreMain/src/Makefile.am.soname 2007-02-16 10:23:40.000000000 +0100 -+++ ogrenew/OgreMain/src/Makefile.am 2007-02-16 10:23:40.000000000 +0100 -@@ -174,6 +174,6 @@ - - platformdir = $(libdir) - libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) --libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ - #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map - ---- ogrenew/OgreMain/src/Makefile.in.soname 2007-02-16 10:23:40.000000000 +0100 -+++ ogrenew/OgreMain/src/Makefile.in 2007-02-16 10:23:40.000000000 +0100 -@@ -453,7 +453,7 @@ - OgreCompiler2Pass.cpp $(am__append_1) - platformdir = $(libdir) - libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) --libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ - all: all-am - - .SUFFIXES: ---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in.soname 2007-01-21 10:59:55.000000000 +0100 -+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in 2007-02-16 10:41:42.000000000 +0100 -@@ -247,6 +247,8 @@ - OgreCEGUITexture.cpp \ - OgreCEGUIResourceProvider.cpp - -+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ -+ - all: all-am - - .SUFFIXES: ---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am.soname 2005-06-06 13:05:19.000000000 +0200 -+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am 2007-02-16 10:41:42.000000000 +0100 -@@ -6,3 +6,5 @@ - libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp \ - OgreCEGUITexture.cpp \ - OgreCEGUIResourceProvider.cpp -+ -+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@ ---- ogrenew/configure.soname 2007-01-21 11:00:29.000000000 +0100 -+++ ogrenew/configure 2007-02-16 10:42:38.000000000 +0100 -@@ -462,7 +462,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL_LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL_LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -23067,13 +23067,6 @@ - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - --OGREMAIN_CURRENT=13 --OGREMAIN_REVISION=0 --OGREMAIN_AGE=0 --OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE -- -- -- - ac_config_files="$ac_config_files Makefile OgreMain/Makefile OgreMain/src/Makefile OgreMain/include/Makefile PlatformManagers/Makefile PlatformManagers/SDL/Makefile PlatformManagers/SDL/src/Makefile PlatformManagers/SDL/include/Makefile PlatformManagers/gtk/Makefile PlatformManagers/gtk/src/Makefile PlatformManagers/gtk/include/Makefile PlatformManagers/GLX/Makefile PlatformManagers/GLX/src/Makefile PlatformManagers/GLX/include/Makefile PlatformManagers/Win32/Makefile PlatformManagers/Win32/src/Makefile PlatformManagers/Win32/include/Makefile PlugIns/Makefile PlugIns/BSPSceneManager/Makefile PlugIns/BSPSceneManager/src/Makefile PlugIns/BSPSceneManager/include/Makefile PlugIns/CgProgramManager/Makefile PlugIns/CgProgramManager/src/Makefile PlugIns/CgProgramManager/include/Makefile PlugIns/OctreeSceneManager/Makefile PlugIns/OctreeSceneManager/src/Makefile PlugIns/OctreeSceneManager/include/Makefile PlugIns/ParticleFX/Makefile PlugIns/ParticleFX/src/Makefile PlugIns/ParticleFX/include/Makefile RenderSystems/Makefile RenderSystems/GL/Makefile RenderSystems/GL/src/Makefile RenderSystems/GL/include/Makefile RenderSystems/GL/src/atifs/Makefile RenderSystems/GL/src/atifs/include/Makefile RenderSystems/GL/src/atifs/src/Makefile RenderSystems/GL/src/GLSL/Makefile RenderSystems/GL/src/GLSL/include/Makefile RenderSystems/GL/src/GLSL/src/Makefile RenderSystems/GL/src/nvparse/Makefile RenderSystems/Direct3D9/Makefile RenderSystems/Direct3D9/src/Makefile RenderSystems/Direct3D9/include/Makefile Samples/Makefile Samples/Common/Makefile Samples/Common/include/Makefile Samples/Common/bin/Makefile Samples/BezierPatch/Makefile Samples/BezierPatch/src/Makefile Samples/BezierPatch/include/Makefile Samples/CameraTrack/Makefile Samples/CameraTrack/src/Makefile Samples/CelShading/Makefile Samples/CelShading/src/Makefile Samples/Compositor/Makefile Samples/Compositor/src/Makefile Samples/Compositor/include/Makefile Samples/CubeMapping/Makefile Samples/CubeMapping/src/Makefile Samples/CubeMapping/include/Makefile Samples/DeferredShading/Makefile Samples/DeferredShading/src/Makefile Samples/DeferredShading/include/Makefile Samples/Dot3Bump/Makefile Samples/Dot3Bump/src/Makefile Samples/EnvMapping/Makefile Samples/EnvMapping/src/Makefile Samples/EnvMapping/include/Makefile Samples/FacialAnimation/Makefile Samples/FacialAnimation/src/Makefile Samples/Fresnel/Makefile Samples/Fresnel/src/Makefile Samples/Grass/Makefile Samples/Grass/src/Makefile Samples/Transpacency/Makefile Samples/Transpacency/src/Makefile Samples/Transpacency/include/Makefile Samples/Lighting/Makefile Samples/Lighting/src/Makefile Samples/Lighting/include/Makefile Samples/OceanDemo/Makefile Samples/OceanDemo/src/Makefile Samples/OceanDemo/include/Makefile Samples/ParticleFX/Makefile Samples/ParticleFX/src/Makefile Samples/ParticleFX/include/Makefile Samples/RenderToTexture/Makefile Samples/RenderToTexture/src/Makefile Samples/TextureFX/Makefile Samples/TextureFX/src/Makefile Samples/TextureFX/include/Makefile Samples/Shadows/Makefile Samples/Shadows/src/Makefile Samples/SkyBox/Makefile Samples/SkyBox/src/Makefile Samples/SkyBox/include/Makefile Samples/SkyDome/Makefile Samples/SkyDome/src/Makefile Samples/SkyDome/include/Makefile Samples/SkyPlane/Makefile Samples/SkyPlane/src/Makefile Samples/SkyPlane/include/Makefile Samples/Smoke/Makefile Samples/Smoke/src/Makefile Samples/Smoke/include/Makefile Samples/BSP/Makefile Samples/BSP/src/Makefile Samples/SkeletalAnimation/Makefile Samples/SkeletalAnimation/src/Makefile Samples/SkeletalAnimation/include/Makefile Samples/Terrain/Makefile Samples/Terrain/src/Makefile Samples/Terrain/include/Makefile Samples/Water/Makefile Samples/Water/src/Makefile Samples/Water/include/Makefile Samples/DynTex/Makefile Samples/DynTex/src/Makefile Samples/DynTex/include/Makefile Samples/VolumeTex/Makefile Samples/VolumeTex/src/Makefile Samples/VolumeTex/include/Makefile Tests/Makefile Tests/src/Makefile Tools/Makefile Tools/MaterialUpgrader/Makefile Tools/MaterialUpgrader/src/Makefile Tools/MaterialUpgrader/include/Makefile Tools/MeshUpgrader/Makefile Tools/MeshUpgrader/src/Makefile Tools/XMLConverter/Makefile Tools/XMLConverter/src/Makefile Tools/XMLConverter/include/Makefile Tools/LightwaveConverter/Makefile Tools/LightwaveConverter/src/Makefile Tools/LightwaveConverter/include/Makefile OGRE.pc" - - -@@ -24061,7 +24054,6 @@ - s,@CEGUI_LIBS@,$CEGUI_LIBS,;t t - s,@HAVE_CEGUI_TRUE@,$HAVE_CEGUI_TRUE,;t t - s,@HAVE_CEGUI_FALSE@,$HAVE_CEGUI_FALSE,;t t --s,@OGREMAIN_VERSION_INFO@,$OGREMAIN_VERSION_INFO,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF ---- ogrenew/configure.in.soname 2007-01-20 15:21:21.000000000 +0100 -+++ ogrenew/configure.in 2007-02-16 10:43:14.000000000 +0100 -@@ -78,15 +78,6 @@ - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - --dnl versioning info for libtool --dnl Note this is the ABI version which is not the same as our actual library version --OGREMAIN_CURRENT=13 --OGREMAIN_REVISION=0 --OGREMAIN_AGE=0 --OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE --AC_SUBST(OGREMAIN_VERSION_INFO) -- -- - dnl Create the makefiles - AC_CONFIG_FILES([Makefile \ - OgreMain/Makefile \ diff --git a/ogre-samples.sh b/ogre-samples.sh index 9cf648c..aed9736 100755 --- a/ogre-samples.sh +++ b/ogre-samples.sh @@ -3,7 +3,7 @@ set -e # find out LIBDIR -if [ -x /usr/lib64/OGRE/Samples/resources.cfg ]; then +if [ -f /usr/lib64/OGRE/Samples/resources.cfg ]; then LIBDIR=/usr/lib64 else LIBDIR=/usr/lib @@ -27,6 +27,8 @@ for i in `(cd $LIBDIR/OGRE; ls *.so)`; do fi done +set +e + for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do if [ $i != ./BSP ]; then $LIBDIR/OGRE/Samples/$i diff --git a/ogre.spec b/ogre.spec index d07396b..6d81b08 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,18 +1,17 @@ Name: ogre -Version: 1.2.5 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine License: LGPL Group: System Environment/Libraries URL: http://www.ogre3d.org/ -Source0: http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2 +Source0: http://downloads.sourceforge.net/ogre/ogre-linux-osx-v%(echo %{version} | tr . -).tar.bz2 Source1: ogre-samples.sh Patch0: ogre-1.2.1-rpath.patch -Patch1: ogre-1.2.2-soname.patch -Patch2: ogre-1.2.5-ppc64.patch +Patch1: ogre-1.2.5-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel -BuildRequires: libglademm24-devel libsigc++20-devel +BuildRequires: cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel +BuildRequires: libXaw-devel libXrandr-devel libGLU-devel ois-devel %description OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, @@ -60,38 +59,30 @@ with the wrapper script called "Ogre-Samples". %prep %setup -q -n ogrenew %patch0 -p1 -z .rpath -%patch1 -p1 -z .soname -%patch2 -p1 -z .ppc64 -# sigh stop autoxxx from rerunning because of our patches above. -touch aclocal.m4 -touch configure -touch `find -name Makefile.in` -touch OgreMain/include/config.h.in -# we don't do this with a patch since we need %{_libdir} -sed -i 's|libOgrePlatform.so|%{_libdir}/OGRE/libOgrePlatform.so|' \ - OgreMain/include/OgrePlatform.h -# stop some CVS dirs from getting installed -rm -fr `find Docs Samples/Media -name CVS` -#remove execute bits from src-files for -debuginfo package -chmod -x `find RenderSystems/GL -type f` +%patch1 -p1 -z .ppc64 +# stop some CVS stuff from getting installed +rm -r `find Docs Samples/Media -name CVS` 'Docs/manual/.#manual_16.html.1.47' \ + Docs/manual/manual_16.html.rej +# fix line-endings of Docs +sed -i 's/\r//g' Docs/manual/*.html +# 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 -# building ogre with ogre installed leads to ogre linking the ogre apps -# against the installed ogre version instead of the just build version, so -# check for this and barf. -if [ -f /usr/include/OGRE/Ogre.h ]; then - echo "Error building OGRE while OGRE is installed doesn't work, remove OGRE" - exit 1 -fi +# 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 %build -# Upstream advises --with-platform=GLX, but that uses Xrandr for fullscreen, -# which has issues (see bz 190918). -# Notice that if we switch back to GLX --with-cfgtk=gtk can be removed and so -# can the libglademm24-devel and libsigc++20-devel BuildRequires. -%configure --with-platform=SDL --with-cfgtk=gtk --disable-cg +# notice we disable freeimage (and thus use DevIL) because freeimage +# is GPL not LGPL +%configure --disable-cg --disable-freeimage # 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 @@ -101,32 +92,15 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la -# move libOgrePlatform.so out of %{_libdir} and into the OGRE plugins dirs as -# its not versioned and only used through dlopen, so its effectivly a plugin. -mv $RPM_BUILD_ROOT%{_libdir}/libOgrePlatform.so $RPM_BUILD_ROOT%{_libdir}/OGRE - -# fix rpm-debuginfo not handling symlinks correctly see BZ 189928 -pushd PlatformManagers/SDL -rm src/OgreSDLConfig.cpp -cp src/OgreSDLConfig_gtk.cpp src/OgreSDLConfig.cpp -rm include/OgreSDLConfig.h -cp include/OgreSDLConfig_gtk.h include/OgreSDLConfig.h -popd - -# the gtk-configurator wants this file and it doesn't get installed -# by make install so DYI -mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Media -install -p -m 644 Samples/Media/materials/textures/ogrelogo-small.jpg \ - $RPM_BUILD_ROOT%{_datadir}/OGRE/Media +rm $RPM_BUILD_ROOT%{_libdir}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la # Install the samples mkdir -p $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples -for exe in `find Samples/Common/bin -type f -perm +111 -print -maxdepth 1` -do - install -p -m 755 $exe $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples -done +# 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 `find Samples/Common/bin -name \*.cfg -print -maxdepth 1` do install -p -m 644 $cfg $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples @@ -177,6 +151,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 30 2007 Hans de Goede 1.4.2-1 +- New upstream release 1.4.2 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! +- Warning this release also breaks the API! + * Thu May 24 2007 Hans de Goede 1.2.5-2 - Fix building on ppc64 diff --git a/sources b/sources index 59980ff..9a38e76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4c9c0e6dda14009c8e7a29de876d9a1 ogre-linux_osx-v1-2-5.tar.bz2 +52eea0cf5fc659d9ca63491348e0e0ec ogre-linux-osx-v1-4-2.tar.bz2