[ogre] Remove manual build of rcapsdump in spec file.
Bruno Wolff III
bruno at fedoraproject.org
Mon Jan 3 05:50:28 UTC 2011
commit fb0836e7ee9d8d999384b6b7e89f8f683668b86f
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Jan 2 23:41:53 2011 -0600
Remove manual build of rcapsdump in spec file.
I was confused thinking that cmake was building rcapsdump, when it was
actually the spec file. The spec file had a manual list of libraries
that was incomplete. Now the build is setup using cmake configuration
so the correct libraries get included and the manual build was removed
from the spec file.
...O-fix.patch => ogre-1.7.2-build-rcapsdump.patch | 0
ogre.spec | 7 ++-----
2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/ogre-1.7.2-rcapsdump-DSO-fix.patch b/ogre-1.7.2-build-rcapsdump.patch
similarity index 100%
rename from ogre-1.7.2-rcapsdump-DSO-fix.patch
rename to ogre-1.7.2-build-rcapsdump.patch
diff --git a/ogre.spec b/ogre.spec
index 461d8eb..c4d1221 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -26,7 +26,7 @@ Patch1: ogre-1.6.0rc1-glew.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
-Patch5: ogre-1.7.2-rcapsdump-DSO-fix.patch
+Patch5: ogre-1.7.2-build-rcapsdump.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
@@ -87,7 +87,7 @@ with the wrapper script called "Ogre-Samples".
%patch2 -p1 -z .sys-tinyxml
%patch3 -p1 -z .ppc
%patch4 -p1 -z .pkgconfig
-%patch5 -p0 -z .rcapsdump-DSO
+%patch5 -p0 -z .build-rcapsdump
# 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
@@ -122,9 +122,6 @@ 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
cd build
make DESTDIR=$RPM_BUILD_ROOT install
More information about the scm-commits
mailing list