rpms/ogre/F-8 .cvsignore, 1.8, 1.9 ogre-samples.sh, 1.2, 1.3 ogre.spec, 1.16, 1.17 sources, 1.8, 1.9

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28361

Modified Files:
	.cvsignore ogre-samples.sh ogre.spec sources 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-2
- Oops I just found out that ogre contains private copies of GL and GLEW
  headers, which fall under the not 100% SGI Free Software B and GLX Public
  License licenses, remove these (even from the tarbal!) and use the system
  versions instead



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Oct 2007 14:49:25 -0000	1.8
+++ .cvsignore	16 Jan 2008 19:22:30 -0000	1.9
@@ -1 +1 @@
-ogre-linux_osx-v1-4-5.tar.bz2
+ogre-1.4.6-clean.tar.bz2


Index: ogre-samples.sh
===================================================================
RCS file: /cvs/extras/rpms/ogre/F-8/ogre-samples.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogre-samples.sh	1 Jul 2007 20:26:43 -0000	1.2
+++ ogre-samples.sh	16 Jan 2008 19:22:30 -0000	1.3
@@ -29,8 +29,15 @@
 
 set +e
 
-for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do
-  if [ $i != ./BSP ]; then
-    $LIBDIR/OGRE/Samples/$i
-  fi
-done
+if [ $# -ge 1 ]; then
+  while [ $# -ge 1 ]; do
+    $LIBDIR/OGRE/Samples/$1
+    shift
+  done
+else
+  for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do
+    if [ $i != ./BSP ]; then
+      $LIBDIR/OGRE/Samples/$i
+    fi
+  done
+fi


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/F-8/ogre.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ogre.spec	8 Oct 2007 18:23:35 -0000	1.16
+++ ogre.spec	16 Jan 2008 19:22:30 -0000	1.17
@@ -1,17 +1,20 @@
 Name:           ogre
-Version:        1.4.5
-Release:        1%{?dist}
+Version:        1.4.6
+Release:        2%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
+# This is http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
+# With the non free licensed headers under RenderSystems/GL/include/GL removed
+Source0:        ogre-%{version}-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
+Patch1:         ogre-1.4.6-system-glew.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
-BuildRequires:  ois-devel
+BuildRequires:  ois-devel glew-devel
 
 %description
 OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
@@ -59,12 +62,7 @@
 %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
+%patch1 -p1 -z .glew
 # stop some CVS stuff from getting installed
 rm -r `find Docs Samples/Media -name CVS`
 # fix line-endings of Docs
@@ -101,6 +99,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}
 
 
@@ -116,9 +117,9 @@
 # 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
+for cfg in media.cfg quake3settings.cfg resources.cfg; do
+  install -p -m 644 Samples/Common/bin/$cfg \
+    $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
 done
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/Ogre-Samples
 
@@ -166,6 +167,27 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-2
+- Oops I just found out that ogre contains private copies of GL and GLEW
+  headers, which fall under the not 100% SGI Free Software B and GLX Public
+  License licenses, remove these (even from the tarbal!) and use the system
+  versions instead
+
+* Sat Dec 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-1
+- New upstream release 1.4.6
+- Warning as always with a new upstream ogre release this breaks the ABI
+  and changes the soname!
+
+* 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)
+- Don't install a useless / broken plugins.cfg in the Samples folder,
+  Ogre-Samples will generate a correct one when run (bz 377011)
+
 * Mon Oct  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.5-1
 - New upstream release 1.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Oct 2007 14:49:25 -0000	1.8
+++ sources	16 Jan 2008 19:22:30 -0000	1.9
@@ -1 +1 @@
-efce9ce9e2b0e2d593e45479210bd4af  ogre-linux_osx-v1-4-5.tar.bz2
+d51c457bf1903f2a0ac15bdfee696f8c  ogre-1.4.6-clean.tar.bz2