rpms/ogre/devel .cvsignore, 1.4, 1.5 ogre-1.2.2-soname.patch, 1.2, 1.3 ogre.spec, 1.6, 1.7 sources, 1.4, 1.5
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Feb 16 13:08:37 UTC 2007
- Previous message: rpms/scummvm/devel scummvm-0.9.1-new-flac.patch, NONE, 1.1 scummvm-0.9.1-no-execstack.patch, NONE, 1.1 scummvm.spec, 1.3, 1.4
- Next message: rpms/dvdisaster/FC-5 .cvsignore, 1.5, 1.6 dvdisaster.spec, 1.16, 1.17 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408
Modified Files:
.cvsignore ogre-1.2.2-soname.patch ogre.spec sources
Log Message:
* Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-1
- New upstream release 1.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Oct 2006 15:58:04 -0000 1.4
+++ .cvsignore 16 Feb 2007 13:08:05 -0000 1.5
@@ -1 +1 @@
-ogre-linux_osx-v1-2-3.tar.bz2
+ogre-linux_osx-v1-2-5.tar.bz2
ogre-1.2.2-soname.patch:
Index: ogre-1.2.2-soname.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.2-soname.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogre-1.2.2-soname.patch 27 Oct 2006 15:58:04 -0000 1.2
+++ ogre-1.2.2-soname.patch 16 Feb 2007 13:08:05 -0000 1.3
@@ -1,5 +1,5 @@
---- ogrenew/OgreMain/src/Makefile.am.soname 2006-07-31 12:53:33.000000000 +0200
-+++ ogrenew/OgreMain/src/Makefile.am 2006-07-31 12:53:33.000000000 +0200
+--- 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)
@@ -8,9 +8,9 @@
+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
#-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
---- ogrenew/OgreMain/src/Makefile.in.soname 2006-07-31 12:54:18.000000000 +0200
-+++ ogrenew/OgreMain/src/Makefile.in 2006-07-31 12:56:32.000000000 +0200
-@@ -452,7 +452,7 @@
+--- 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)
@@ -19,8 +19,27 @@
all: all-am
.SUFFIXES:
---- ogrenew/configure.soname 2006-07-31 12:54:01.000000000 +0200
-+++ ogrenew/configure 2006-07-31 12:54:58.000000000 +0200
+--- 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 <unistd.h>
#endif"
@@ -30,11 +49,11 @@
ac_subst_files=''
# Initialize some variables set by options.
-@@ -23065,13 +23065,6 @@
+@@ -23067,13 +23067,6 @@
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
--OGREMAIN_CURRENT=12
+-OGREMAIN_CURRENT=13
-OGREMAIN_REVISION=0
-OGREMAIN_AGE=0
-OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
@@ -44,7 +63,7 @@
!
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/Makef!
ile PlugIns/BSPSceneManager/src/Makefile PlugIns/BSPSceneManag!
er/inclu
de/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/BezierPatc!
h/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/Mak!
efile Sa
mples/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 S!
amples/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"
-@@ -24058,7 +24048,6 @@
+@@ -24061,7 +24054,6 @@
s, at CEGUI_LIBS@,$CEGUI_LIBS,;t t
s, at HAVE_CEGUI_TRUE@,$HAVE_CEGUI_TRUE,;t t
s, at HAVE_CEGUI_FALSE@,$HAVE_CEGUI_FALSE,;t t
@@ -52,15 +71,15 @@
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
---- ogrenew/configure.in.soname 2006-07-23 00:12:06.000000000 +0200
-+++ ogrenew/configure.in 2006-07-31 12:53:33.000000000 +0200
+--- 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=12
+-OGREMAIN_CURRENT=13
-OGREMAIN_REVISION=0
-OGREMAIN_AGE=0
-OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
@@ -70,22 +89,3 @@
dnl Create the makefiles
AC_CONFIG_FILES([Makefile \
OgreMain/Makefile \
---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in~ 2006-08-01 12:31:32.000000000 +0200
-+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in 2006-08-01 12:31:32.000000000 +0200
-@@ -246,6 +246,8 @@
- OgreCEGUITexture.cpp \
- OgreCEGUIResourceProvider.cpp
-
-+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
-+
- all: all-am
-
- .SUFFIXES:
---- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am~ 2006-08-01 12:31:33.000000000 +0200
-+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am 2006-08-01 12:31:33.000000000 +0200
-@@ -6,3 +6,5 @@
- libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp \
- OgreCEGUITexture.cpp \
- OgreCEGUIResourceProvider.cpp
-+
-+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ogre.spec 22 Jan 2007 16:02:25 -0000 1.6
+++ ogre.spec 16 Feb 2007 13:08:05 -0000 1.7
@@ -1,6 +1,6 @@
Name: ogre
-Version: 1.2.3
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
License: LGPL
Group: System Environment/Libraries
@@ -37,6 +37,7 @@
%package devel-doc
Summary: Ogre development documentation
Group: Documentation
+Requires: %{name} = %{version}-%{release}
%description devel-doc
This package contains the Ogre API documentation and the Ogre development
@@ -44,14 +45,15 @@
%package samples
-Summary: Ogre samples executables and media.
-Group: Documentation
+Summary: Ogre samples executables and media
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
%description samples
This package contains the compiled (not the source) sample applications coming
with Ogre. It also contains some media (meshes, textures,...) needed by these
-samples. The samples are installed in %{_libdir}/Samples and must be executed
-from this directory!
+samples. The samples are installed in %{_libdir}/Samples and can be executed
+with the wrapper script called "Ogre-Samples".
%prep
@@ -73,6 +75,13 @@
# 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
%build
@@ -166,6 +175,9 @@
%changelog
+* Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-1
+- New upstream release 1.2.5
+
* Fri Jan 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-2
- Rebuild for new cairomm
- Added a samples sub-package (suggested by Xavier Decoret)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Oct 2006 15:58:04 -0000 1.4
+++ sources 16 Feb 2007 13:08:05 -0000 1.5
@@ -1 +1 @@
-b2a8e3df61e2245c46457367a6b73ca0 ogre-linux_osx-v1-2-3.tar.bz2
+b4c9c0e6dda14009c8e7a29de876d9a1 ogre-linux_osx-v1-2-5.tar.bz2
- Previous message: rpms/scummvm/devel scummvm-0.9.1-new-flac.patch, NONE, 1.1 scummvm-0.9.1-no-execstack.patch, NONE, 1.1 scummvm.spec, 1.3, 1.4
- Next message: rpms/dvdisaster/FC-5 .cvsignore, 1.5, 1.6 dvdisaster.spec, 1.16, 1.17 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list