rpms/ogre/devel ogre.spec,1.17,1.18

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24111

Modified Files:
	ogre.spec 
Log Message:
* Wed Nov 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-3
- Fix building of ogre with an older version of ogre-devel installed
  (bz 382311)



Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ogre.spec	12 Nov 2007 09:38:42 -0000	1.17
+++ ogre.spec	14 Nov 2007 22:15:06 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.4.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -59,12 +59,6 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-# building ogre while ogre-devel is installed results in binaries getting
-# linked against the installed version, instead of the just build one <sigh>
-if [ -f /usr/include/OGRE/Ogre.h ]; then
-  echo "Error building ogre while ogre-devel is installed does not work!"
-  exit 1
-fi
 # stop some CVS stuff from getting installed
 rm -r `find Docs Samples/Media -name CVS`
 # fix line-endings of Docs
@@ -101,6 +95,9 @@
 # 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`
 make %{?_smp_mflags}
 
 
@@ -166,6 +163,10 @@
 
 
 %changelog
+* Wed Nov 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-3
+- Fix building of ogre with an older version of ogre-devel installed
+  (bz 382311)
+
 * Mon Nov 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-2
 - Ogre-Samples now takes the name of which samples to run as arguments, if no
   arguments are provided, it will run all of them like it used too (bz 377011)