rpms/ogre/devel .cvsignore, 1.5, 1.6 ogre-1.2.1-rpath.patch, 1.1, 1.2 ogre-samples.sh, 1.1, 1.2 ogre.spec, 1.8, 1.9 sources, 1.5, 1.6 ogre-1.2.2-soname.patch, 1.3, NONE

Sun Jul 1 20:27:19 UTC 2007

Author: jwrdegoede

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

Modified Files:
	.cvsignore ogre-1.2.1-rpath.patch ogre-samples.sh ogre.spec 
	sources 
Removed Files:
	ogre-1.2.2-soname.patch 
Log Message:
* Sat Jun 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 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!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	16 Feb 2007 13:08:05 -0000	1.5
+++ .cvsignore	1 Jul 2007 20:26:43 -0000	1.6
@@ -1 +1 @@
-ogre-linux_osx-v1-2-5.tar.bz2
+ogre-linux-osx-v1-4-2.tar.bz2

ogre-1.2.1-rpath.patch:

Index: ogre-1.2.1-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.1-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.1-rpath.patch	7 Jul 2006 18:24:11 -0000	1.1
+++ ogre-1.2.1-rpath.patch	1 Jul 2007 20:26:43 -0000	1.2
@@ -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:


Index: ogre-samples.sh
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-samples.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-samples.sh	22 Jan 2007 16:02:25 -0000	1.1
+++ ogre-samples.sh	1 Jul 2007 20:26:43 -0000	1.2
@@ -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 @@
   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


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ogre.spec	24 May 2007 09:02:47 -0000	1.8
+++ ogre.spec	1 Jul 2007 20:26:43 -0000	1.9
@@ -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 @@
 %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 @@
 %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 <sigh> 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 @@
 
 
 %changelog
+* Sat Jun 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 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 <j.w.r.degoede at hhs.nl> 1.2.5-2
 - Fix building on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Feb 2007 13:08:05 -0000	1.5
+++ sources	1 Jul 2007 20:26:43 -0000	1.6
@@ -1 +1 @@
-b4c9c0e6dda14009c8e7a29de876d9a1  ogre-linux_osx-v1-2-5.tar.bz2
+52eea0cf5fc659d9ca63491348e0e0ec  ogre-linux-osx-v1-4-2.tar.bz2


--- ogre-1.2.2-soname.patch DELETED ---


