rpms/ogre/devel ogre-make-clean.sh, NONE, 1.1 .cvsignore, 1.17, 1.18 ogre.spec, 1.50, 1.51 sources, 1.18, 1.19

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287

Modified Files:
	.cvsignore ogre.spec sources 
Added Files:
	ogre-make-clean.sh 
Log Message:
* Thu Apr 16 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.2-1
- New upstream release 1.6.2
- Exceptions added to License
- Reenabling OpenEXR plugin, as it fixed now



--- NEW FILE ogre-make-clean.sh ---
#!/bin/sh

set -e
set -x

version=1.6.2

[ ! -e ogre ]

tar xjf ogre-v$(echo ${version} | tr . -).tar.bz2

cd ogre

# - Non-free licensed headers under RenderSystems/GL/include/GL removed
rm RenderSystems/GL/include/GL/{gl,glext,glxext,glxtokens,wglext}.h

# - GLEW sources updated to 1.5.1
rpm -q glew-devel glew-debuginfo
cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/
cp -f /usr/src/debug/glew/src/glew.c RenderSystems/GL/src/glew.cpp
dos2unix RenderSystems/GL/src/glew.cpp

# - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
rm Samples/Media/packs/chiropteraDM.{pk3,txt}

# - Non-free fonts under Samples/Media/fonts removed
rm Samples/Media/fonts/{bluebold,bluecond,bluehigh,solo5}.ttf

cd ..

tar cjf ogre-$version-clean.tar.bz2 ogre


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Feb 2009 17:14:13 -0000	1.17
+++ .cvsignore	16 Apr 2009 13:13:18 -0000	1.18
@@ -1 +1 @@
-ogre-1.6.1-clean.tar.bz2
+ogre-1.6.2-clean.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ogre.spec	20 Mar 2009 20:42:10 -0000	1.50
+++ ogre.spec	16 Apr 2009 13:13:18 -0000	1.51
@@ -1,18 +1,18 @@
 Name:           ogre
-Version:        1.6.1
-Release:        5%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
-# LGPLv2+  - main library
+# LGPLv2+ with exceptions - main library
 # CC-BY-SA - devel docs
 # Freely redistributable without restriction - most of samples content
 # MIT      - shaders for DeferredShadingMedia samples
-License:        LGPLv2+ and CC-BY-SA and Freely redistributable without restriction and MIT
+License:        LGPLv2+ with exceptions and CC-BY-SA and Freely redistributable without restriction and MIT
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is modified http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # with non-free files striped:
 # - Non-free licensed headers under RenderSystems/GL/include/GL removed
-# - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 2.5.0 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
+# - GLEW sources (RenderSystems/GL/include/GL, RenderSystems/GL/src/GL/glew.cpp) updated to 1.5.1 - upstream doesn't want to update http://www.ogre3d.org/phpBB2/viewtopic.php?t=44558
 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed
 # - Non-free fonts under Samples/Media/fonts removed
 Source0:        %{name}-%{version}-clean.tar.bz2
@@ -26,8 +26,8 @@
 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
-BuildRequires:  ois-devel freeimage-devel
-#BuildRequires:  openexr-devel glew-devel
+BuildRequires:  ois-devel freeimage-devel openexr-devel
+#BuildRequires:  glew-devel
 BuildRequires:  tinyxml-devel
 
 %description
@@ -78,7 +78,7 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
-%patch3 -p1
+%patch3 -p1 -z .ppc
 # 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
@@ -92,7 +92,6 @@
   Samples/Media/gui/Falagard.xsd \
   Samples/Media/materials/scripts/Example-DynTex.material
 # create a clean version of the api docs for %%doc
-rm -rf ./Docs/
 mkdir api
 find . \( -wholename './Docs/api/html/*.html' -or \
   -wholename './Docs/api/html/*.gif' -or -wholename './Docs/api/html/*.png' \
@@ -105,12 +104,15 @@
   touch -r $i api/tmp
   mv api/tmp $i
 done
+# Add lgpl.txt symlink for links in License.html
+rm -r Docs/licenses/*
+ln -s COPYING Docs/licenses/lgpl.txt
 # remove included tinyxml headers to ensure use of system headers
 rm Tools/XMLConverter/include/tiny*
 
 
 %build
-%configure --disable-cg --disable-devil
+%configure --disable-cg --disable-devil --enable-openexr
 # 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
@@ -182,7 +184,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING
-%doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
+%doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif
 %{_bindir}/Ogre*
 %{_bindir}/rcapsdump
 %{_libdir}/lib*Ogre*-%{version}.so
@@ -202,7 +204,7 @@
 
 %files devel-doc
 %defattr(-,root,root,-)
-%doc LINUX.DEV api Docs/manual Docs/vbo-update Docs/style.css
+%doc LINUX.DEV api Docs/manual Docs/shadows Docs/vbo-update Docs/style.css
 
 %files samples
 %defattr(-,root,root)
@@ -213,6 +215,11 @@
 
 
 %changelog
+* Thu Apr 16 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.2-1
+- New upstream release 1.6.2
+- Exceptions added to License
+- Reenabling OpenEXR plugin, as it fixed now
+
 * Fri Mar 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-5
 - Add licenses of samples to License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Feb 2009 17:14:13 -0000	1.18
+++ sources	16 Apr 2009 13:13:18 -0000	1.19
@@ -1 +1 @@
-b3382c4bbb5b171ce2f4eba3f10c611d  ogre-1.6.1-clean.tar.bz2
+41cf1af6c7ec587a2029298b774dcaf8  ogre-1.6.2-clean.tar.bz2