rpms/OpenSceneGraph/devel OpenSceneGraph-2.0.diff, 1.2, 1.3 OpenSceneGraph.spec, 1.26, 1.27

Ralf Corsépius (corsepiu) fedora-extras-commits at redhat.com
Wed Aug 22 05:05:32 UTC 2007 

Author: corsepiu

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

Modified Files:
	OpenSceneGraph-2.0.diff OpenSceneGraph.spec 
Log Message:
* 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.
- Rename pkgconfig files into *-2.pc.
- Reactivate ppc64.
- Mass rebuild.


OpenSceneGraph-2.0.diff:

Index: OpenSceneGraph-2.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph-2.0.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenSceneGraph-2.0.diff	30 Jun 2007 03:33:20 -0000	1.2
+++ OpenSceneGraph-2.0.diff	22 Aug 2007 05:04:57 -0000	1.3
@@ -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-06-29 19:05:08.000000000 +0200
++++ OpenSceneGraph/CMakeModules/OsgMacroUtils.cmake	2007-08-22 06:45:47.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-06-29 19:06:01.000000000 +0200
++++ OpenSceneGraph/doc/Doxyfiles/core_Doxyfile	2007-08-22 06:45:47.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-06-29 19:05:08.000000000 +0200
++++ OpenSceneGraph/examples/CMakeLists.txt	2007-08-22 06:45:47.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.pc OpenSceneGraph/pkgconfig/openscenegraph.pc
---- OpenSceneGraph.orig/pkgconfig/openscenegraph.pc	1970-01-01 01:00:00.000000000 +0100
-+++ OpenSceneGraph/pkgconfig/openscenegraph.pc	2007-06-29 19:08:12.000000000 +0200
+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-08-22 06:46:46.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -54,16 +54,16 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openscenegraph
++Name: openscenegraph-2
 +Description: 3D scenegraph
 +Version: 2.0
-+Requires: openthreads
++Requires: openthreads-2
 +Conflicts:
 +Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil
 +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-06-30 04:39:52.000000000 +0200
+diff -uNr OpenSceneGraph.orig/pkgconfig/openthreads-2.pc OpenSceneGraph/pkgconfig/openthreads-2.pc
+--- OpenSceneGraph.orig/pkgconfig/openthreads-2.pc	1970-01-01 01:00:00.000000000 +0100
++++ OpenSceneGraph/pkgconfig/openthreads-2.pc	2007-08-22 06:47:10.000000000 +0200
 @@ -0,0 +1,14 @@
 +# pkg-config source file
 +
@@ -72,7 +72,7 @@
 +libdir=${exec_prefix}/lib
 +includedir=${prefix}/include
 +
-+Name: openthreads
++Name: openthreads-2
 +Description: Object-Oriented (OO) thread interface for C++ programmers
 +Version: 2.0
 +Requires:


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- OpenSceneGraph.spec	30 Jun 2007 06:25:19 -0000	1.26
+++ OpenSceneGraph.spec	22 Aug 2007 05:04:57 -0000	1.27
@@ -7,14 +7,15 @@
 %define apivers 2.0
 %define srcvers 2.0
 
+# pkgconfig support has been abandoned pkgconfig support
 %define _with_pkgconfig 0
 
-# The lastest rpm "version-release" of OSG1's Producer in Fedora.
+# The latest rpm "version-release" of OSG1's Producer in Fedora.
 %define OSG1_Producer 1.2-4%{?dist}
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -26,7 +27,7 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BZ: 245192, 245196
-ExcludeArch:    ppc64
+# ExcludeArch:    ppc64
 
 BuildRequires:  libGL-devel
 BuildRequires:  libGLU-devel
@@ -45,6 +46,8 @@
 # Required to let yum remove Producer (from OSG-1)
 Obsoletes:	Producer <= %{OSG1_Producer}
 
+Provides:       OpenSceneGraph2 = %{version}-%{release}
+
 %description
 The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the 
 development of high performance graphics applications such as flight 
@@ -81,8 +84,8 @@
 %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.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D pkgconfig/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+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
 
@@ -101,17 +104,28 @@
 %{_bindir}/osgconv
 %{_bindir}/osgversion
 %{_bindir}/osgviewer
+
+%package libs
+Summary:        Devel files for OpenSceneGraph
+Group:          Applications/Multimedia
+Provides:	OpenSceneGraph2-libs = %{version}-%{release}
+
+%description libs
+Runtime libraries files for OpenSceneGraph.
+
+%files libs
+%defattr(-,root,root,-)
 %{_libdir}/osgPlugins-2.0.*
 %{_libdir}/libosg*.so.*
 
 %package devel
 Summary:        Devel files for OpenSceneGraph
 Group:          Applications/Multimedia
-Requires:       %name = %{version}-%{release}
+Requires:	OpenSceneGraph2-libs = %{version}-%{release}
 %if %{?_with_pkgconfig}
 Requires:	pkgconfig
 %endif
-Requires:	OpenThreads-devel
+Requires:	OpenThreads2-devel
 Obsoletes:	Producer-devel <= %{OSG1_Producer}
 
 %description devel
@@ -122,7 +136,7 @@
 %doc BUILD/doc/html
 %{_includedir}/osg*
 %if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openscenegraph.pc
+%{_libdir}/pkgconfig/openscenegraph-2.pc
 %endif
 %{_libdir}/libosg*.so
 
@@ -242,6 +256,7 @@
 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)
@@ -264,7 +279,8 @@
 Summary:        Devel files for OpenThreads
 Group:          Applications/Multimedia
 License:        OSGPL
-Requires:       OpenThreads = %{version}-%{release}
+Provides:       OpenThreads2-devel = %{version}-%{release}
+Requires:       OpenThreads2 = %{version}-%{release}
 %if %{?_with_pkgconfig}
 Requires:	pkgconfig
 %endif
@@ -275,13 +291,20 @@
 %files -n OpenThreads-devel
 %defattr(-,root,root,-)
 %if %{?_with_pkgconfig}
-%{_libdir}/pkgconfig/openthreads.pc
+%{_libdir}/pkgconfig/openthreads-2.pc
 %endif
 %{_libdir}/libOpenThreads.so
 %{_includedir}/OpenThreads
 
 
 %changelog
+* 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.
+- Rename pkgconfig files into *-2.pc.
+- Reactivate ppc64.
+- Mass rebuild.
+
 * Sat Jun 30 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-4
 - Cleanup CVS.
 - Add OSG1_Producer define.

More information about the fedora-extras-commits mailing list