rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff, 1.4, 1.5 OpenSceneGraph.spec, 1.27, 1.28

Thu Sep 27 12:10:36 UTC 2007

Author: corsepiu

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

Modified Files:
	OpenSceneGraph-2.0.diff OpenSceneGraph.spec 
Log Message:
* Thu Sep 27 2007 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.0-7
- Let OpenSceneGraph-libs Obsoletes: Producer
- Let OpenSceneGraph-devel Obsoletes: Producer-devel.

* Wed Sep 26 2007 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.0-6
- By public demand, add upstream's *.pcs.
- Add hacks to work around the worst bugs in *.pcs.
- Add OpenSceneGraph2-devel.
- Move ldconfig to *-libs.
- Abandon OpenThreads2.
- Remove obsolete applications.



OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- OpenSceneGraph-2.0.diff	14 Sep 2007 05:13:08 -0000	1.4
+++ OpenSceneGraph-2.0.diff	27 Sep 2007 12:10:33 -0000	1.5
@@ -1,6 +1,6 @@
 diff -uNr OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake
 --- OpenSceneGraph.orig/CMakeModules/OsgMacroUtils.cmake	2007-06-04 23:02:15.000000000 +0200
-+++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-09-26 10:18:50.000000000 +0200
 @@ -230,7 +230,7 @@
              
          SETUP_EXE(${IS_COMMANDLINE_APP})
@@ -12,7 +12,7 @@
  
 diff -uNr OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 --- OpenSceneGraph.orig/doc/Doxyfiles/core_Doxyfile	2007-05-29 09:25:13.000000000 +0200
-+++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-09-26 10:18:50.000000000 +0200
 @@ -30,7 +30,7 @@
  # If a relative path is entered, it will be relative to the location 
  # where doxygen was started. If left blank the current directory will be used.
@@ -33,7 +33,7 @@
  # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
 diff -uNr OpenSceneGraph.orig/examples/CMakeLists.txt OpenSceneGraph/examples/CMakeLists.txt
 --- OpenSceneGraph.orig/examples/CMakeLists.txt	2007-06-15 15:43:49.000000000 +0200
-+++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-14 06:49:27.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-09-26 10:18:50.000000000 +0200
 @@ -82,7 +82,7 @@
      ADD_SUBDIRECTORY(osgspotlight)
      ADD_SUBDIRECTORY(osgstereoimage)
@@ -43,9 +43,9 @@
      ADD_SUBDIRECTORY(osgtext)
      ADD_SUBDIRECTORY(osgtexture1D)
      ADD_SUBDIRECTORY(osgtexture2D)
-diff -uNr OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc OpenSceneGraph/pkgconfig/openscenegraph-2.pc
---- OpenSceneGraph.orig/pkgconfig/openscenegraph-2.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph-2.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openscenegraph.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -54,16 +54,16 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openscenegraph-2
++Name: openscenegraph
 +Description: 3D scenegraph
-+Version: 2.0
++Version: 2.1.12
 +Requires: openthreads
 +Conflicts:
-+Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
++Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer
 +Cflags: -I${includedir}
-diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads.pc OpenSceneGraph/pkgconfig/openthreads.pc
---- OpenSceneGraph.orig/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openthreads.pc	2007-09-14 06:49:27.000000000 +0200
+diff -uNr OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+--- OpenSceneGraph.orig/packaging/pkgconfig/openthreads.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/packaging/pkgconfig/openthreads.pc	2007-09-26 10:19:00.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -74,7 +74,7 @@
 +
 +Name: openthreads
 +Description: Object-Oriented (OO) thread interface for C++ programmers
-+Version: 2.0
++Version: 1.9.6
 +Requires:
 +Conflicts:
 +Libs: -L${libdir} -lOpenThreads


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- OpenSceneGraph.spec	22 Aug 2007 05:04:57 -0000	1.27
+++ OpenSceneGraph.spec	27 Sep 2007 12:10:33 -0000	1.28
@@ -7,15 +7,15 @@
 %define apivers 2.0
 %define srcvers 2.0
 
-# pkgconfig support has been abandoned pkgconfig support
-%define _with_pkgconfig 0
+# HACK: Work around to yum not being able to remove packages
+%define _obsolete_Producer 1
 
-# The latest rpm "version-release" of OSG1's Producer in Fedora.
-%define OSG1_Producer 1.2-4%{?dist}
+# Force pushing out OSG1's Producer
+%define OSG1_Producer 1:1.2-0
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -26,8 +26,6 @@
 Patch0:         OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# BZ: 245192, 245196
-# ExcludeArch:    ppc64
 
 BuildRequires:  libGL-devel
 BuildRequires:  libGLU-devel
@@ -42,11 +40,10 @@
 BuildRequires:  doxygen graphviz
 BuildRequires:  cmake
 BuildRequires:  wxGTK-devel
-# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
-# Required to let yum remove Producer (from OSG-1)
-Obsoletes:	Producer <= %{OSG1_Producer}
 
+%if "%{name}" == "OpenSceneGraph"
 Provides:       OpenSceneGraph2 = %{version}-%{release}
+%endif
 
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
@@ -73,6 +70,18 @@
 OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
 popd
 
+# HACK: Upstream stuff lacks cmake support and is broken
+sed -i -e 's,^prefix=.*$,prefix=%{_prefix},' \
+  -e 's,^libdir=.*$,libdir=%{_libdir},' \
+  -e 's,^includedir=.*$,includedir=%{_includedir},' \
+  -e '/^Conflicts.*$/d' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+sed -i -e 's,Version:.*,Version: 2.0.0,' \
+  OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc
+sed -i -e 's,Version:.*,Version: 1.9.5,' \
+  OpenSceneGraph/packaging/pkgconfig/openthreads.pc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd BUILD
@@ -80,21 +89,18 @@
 
 # Supposed to take OpenSceneGraph data
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/OpenSceneGraph
-
-%if %{?_with_pkgconfig}
-# Abandoned by upstream, re-added by patch
-# FIXME: Don't ship for now. Consider to re-activate
-install -m 644 -D pkgconfig/openthreads-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads-2.pc
-install -m 644 -D pkgconfig/openscenegraph-2.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif 
 popd
 
+# Abandoned w/ 2.0 by upstream, re-added to 2.1.*
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openthreads.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
+install -m 644 -D OpenSceneGraph/packaging/pkgconfig/openscenegraph.pc \
+  ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 
 %files
@@ -108,11 +114,23 @@
 %package libs
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
 Provides:	OpenSceneGraph2-libs = %{version}-%{release}
+%endif
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
+Obsoletes:	Producer <= %{OSG1_Producer}
+%endif
+
 
 %description libs
 Runtime libraries files for OpenSceneGraph.
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/osgPlugins-2.0.*
@@ -121,12 +139,18 @@
 %package devel
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:	OpenSceneGraph2-devel = %{version}-%{release}
+%endif
 Requires:	OpenSceneGraph2-libs = %{version}-%{release}
-%if %{?_with_pkgconfig}
 Requires:	pkgconfig
-%endif
-Requires:	OpenThreads2-devel
+Requires:	OpenThreads-devel
+%if %{?_obsolete_Producer}
+# HACK: Upstream abandoned Producer, but yum doesn't want to remove packages.
+# Required to let yum remove Producer (from OSG-1)
 Obsoletes:	Producer-devel <= %{OSG1_Producer}
+%endif
+
 
 %description devel
 Development files for OpenSceneGraph.
@@ -135,15 +159,16 @@
 %defattr(-,root,root,-)
 %doc BUILD/doc/html
 %{_includedir}/osg*
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openscenegraph-2.pc
-%endif
+%{_libdir}/pkgconfig/openscenegraph.pc
 %{_libdir}/libosg*.so
 
 # OpenSceneGraph-examples
 %package examples
 Summary:        Sample applications for OpenSceneGraph
 Group:          Applications/Multimedia
+%if "%{name}" == "OpenSceneGraph"
+Provides:       OpenSceneGraph2-examples = %{version}-%{release}
+%endif
 
 %description examples
 Sample applications for OpenSceneGraph
@@ -157,9 +182,6 @@
 %{_bindir}/osgcallback
 %{_bindir}/osgcamera
 %{_bindir}/osgcatch
-%if "%{version}" < "2.0"
-%{_bindir}/osgcameragroup
-%endif
 %{_bindir}/osgclip
 %if "%{version}" < "2.0"
 # doesn't build w/ 2.0
@@ -172,9 +194,6 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
-%if "%{version}" < "1.2"
-%{_bindir}/osgfbo
-%endif
 %{_bindir}/osgfadetext
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
@@ -195,9 +214,6 @@
 %{_bindir}/osgmanipulator
 %{_bindir}/osgmotionblur
 %{_bindir}/osgmovie
-%if "%{version}" < "2.0"
-%{_bindir}/osgmultiplecameras
-%endif
 %{_bindir}/osgmultitexture
 %{_bindir}/osgoccluder
 %{_bindir}/osgpagedlod
@@ -220,10 +236,6 @@
 %{_bindir}/osgshadow
 %{_bindir}/osgshadowtexture
 %{_bindir}/osgshape
-%if "%{version}" < "2.0"
-%{_bindir}/osgsimple
-%{_bindir}/osgsimplepager
-%endif
 %{_bindir}/osgsimplifier
 %{_bindir}/osgslice
 %{_bindir}/osgspacewarp
@@ -256,7 +268,6 @@
 Summary:        OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2 = %{version}-%{release}
 
 %description -n OpenThreads
 OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
@@ -279,25 +290,31 @@
 Summary:        Devel files for OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Provides:       OpenThreads2-devel = %{version}-%{release}
-Requires:       OpenThreads2 = %{version}-%{release}
-%if %{?_with_pkgconfig}
+Requires:       OpenThreads = %{version}-%{release}
 Requires:	pkgconfig
-%endif
 
 %description -n OpenThreads-devel
 Development files for OpenThreads.
 
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
-%if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openthreads-2.pc
-%endif
+%{_libdir}/pkgconfig/openthreads.pc
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
-
 %changelog
+* Thu Sep 27 2007 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.0-7
+- Let OpenSceneGraph-libs Obsoletes: Producer
+- Let OpenSceneGraph-devel Obsoletes: Producer-devel.
+
+* Wed Sep 26 2007 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.0-6
+- By public demand, add upstream's *.pcs.
+- Add hacks to work around the worst bugs in *.pcs.
+- Add OpenSceneGraph2-devel.
+- Move ldconfig to *-libs.
+- Abandon OpenThreads2.
+- Remove obsolete applications.
+
 * Wed Aug 22 2007 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.0-5
 - Prepare renaming package into OpenSceneGraph2.
 - Split out run-time libs into *-libs subpackage.


