rpms/OpenSceneGraph/devel .cvsignore, 1.10, 1.11 OpenSceneGraph.spec, 1.34, 1.35 sources, 1.10, 1.11

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23139

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
* Mon May 12 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.4.0-1
- Upstream update.
- Adjust patches to 2.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Nov 2007 09:42:55 -0000	1.10
+++ .cvsignore	12 May 2008 04:46:25 -0000	1.11
@@ -1 +1 @@
-OpenSceneGraph-2.2.0.zip
+OpenSceneGraph-2.4.0.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- OpenSceneGraph.spec	11 Feb 2008 17:02:45 -0000	1.34
+++ OpenSceneGraph.spec	12 May 2008 04:46:25 -0000	1.35
@@ -4,8 +4,7 @@
 # package are under the same license as the package itself.
 #
 
-%define apivers 2.2.0
-%define srcvers 2.2.0
+%define apivers 2.4.0
 
 # HACK: Work around to yum not being able to remove packages
 %define _obsolete_Producer 1
@@ -14,20 +13,25 @@
 %define OSG1_Producer 1:1.2-0
 
 Name:           OpenSceneGraph
-Version:        %{srcvers}
-Release:        5%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
 URL:            http://www.openscenegraph.org/
+%if "%{version}" >= "2.4.0"
+Source0:        http://www.openscenegraph.org/files/OpenSceneGraph-2.4.0/OpenSceneGraph-%{version}.zip
+Patch0:         OpenSceneGraph-2.4.0.diff
+%else
 %if "%{version}" >= "2.2.0"
-Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{srcvers}.zip
+Source0:        http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{version}.zip
+Patch0:         OpenSceneGraph-2.2.0.diff
 %else
-Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{srcvers}.zip
+Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{version}.zip
+Patch0:         OpenSceneGraph-%{version}.diff
+%endif
 %endif
-
-Patch0:         OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +48,9 @@
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
+%if "%{version}" >= "2.4.0"
+BuildRequires:  curl-devel
+%endif
 
 BuildRequires:	qt-devel
 
@@ -51,11 +58,15 @@
 
 BuildRequires:  fltk-devel
 
+%if "%{version}" >= "2.4.0"
+%define OSGSRCDIR       OpenSceneGraph
+%else
 %if "%{version}" >= "2.2.0"
 %define OSGSRCDIR	OpenSceneGraph-%{version}
 %else
 %define OSGSRCDIR	OpenSceneGraph
 %endif
+%endif
 
 %if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
@@ -72,7 +83,9 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
+cd %{OSGSRCDIR}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %build
 mkdir -p BUILD
@@ -235,6 +248,16 @@
 
 %files examples
 %defattr(-,root,root,-)
+%if "%{version}" >= "2.4.0"
+%{_bindir}/osggeometryshaders
+%{_bindir}/osgmultiplerendertargets
+%{_bindir}/osgmultitexturecontrol
+%{_bindir}/osgocclusionquery
+%{_bindir}/osgsharedarray
+%{_bindir}/osgstereomatch
+%{_bindir}/osgtext3D
+%{_bindir}/osgthirdpersonview
+%endif
 %if "%{version}" >= "2.2.0"
 %{_bindir}/osgdepthpeeling
 %endif
@@ -370,6 +393,10 @@
 %{_includedir}/OpenThreads
 
 %changelog
+* Mon May 12 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.4.0-1
+- Upstream update.
+- Adjust patches to 2.4.0.
+
 * Mon Feb 11 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.2.0-5
 - Add *-examples-SDL package.
 - Add osgviewerSDL.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	2 Nov 2007 09:42:55 -0000	1.10
+++ sources	12 May 2008 04:46:25 -0000	1.11
@@ -1 +1 @@
-5782f082e57a6d6874d81c88dfb480c6  OpenSceneGraph-2.2.0.zip
+4d57fe285a1c6601893b1e0b99ca0bd3  OpenSceneGraph-2.4.0.zip