rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.23,1.24
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Sat Jun 30 03:34:23 UTC 2007
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv928
Modified Files:
OpenSceneGraph.spec
Log Message:
* Fri Jun 29 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-3
- Re-add (but don't ship) *.pc.
- Let OpenSceneGraph "Obsolete: Producer".
- Let OpenSceneGraph-devel "Obsolete: Producer-devel".
* Wed Jun 27 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-2
- Build docs.
* Fri Jun 22 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-1
- Upgrade to 2.0.
Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- OpenSceneGraph.spec 21 Jun 2007 16:12:46 -0000 1.23
+++ OpenSceneGraph.spec 30 Jun 2007 03:33:47 -0000 1.24
@@ -4,40 +4,43 @@
# package are under the same license as the package itself.
#
-%define _with_gdal 1
+%define apivers 2.0
+%define srcvers 2.0
-%define apivers 1.0
-%define srcvers 1.2
+%define _with_pkgconfig 0
Name: OpenSceneGraph
Version: %{srcvers}
-Release: 4%{?dist}
+Release: 3%{?dist}
Summary: High performance real-time graphics toolkit
Group: Applications/Multimedia
License: OSGPL
URL: http://www.openscenegraph.org/
-Source0: http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{srcvers}.zip
+Source0: http://www.openscenegraph.com/downloads/snapshots/OpenSceneGraph-%{srcvers}.zip
-Patch0: OpenSceneGraph-%{srcvers}.diff
+Patch0: OpenSceneGraph-%{srcvers}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BZ: 245192, 245196
-ExcludeArch: ppc64
+ExcludeArch: ppc64
BuildRequires: libGL-devel
-BuildRequires: libGLU-devel
-BuildRequires: libXmu-devel
-BuildRequires: libX11-devel
-BuildRequires: Inventor-devel
-BuildRequires: freeglut-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libungif-devel
-BuildRequires: libtiff-devel
-BuildRequires: libpng-devel
-BuildRequires: doxygen
-
-%{?_with_gdal:BuildRequires: gdal-devel}
+BuildRequires: libGLU-devel
+BuildRequires: libXmu-devel
+BuildRequires: libX11-devel
+BuildRequires: Inventor-devel
+BuildRequires: freeglut-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libungif-devel
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel
+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 <= 1.2-2%{?dist}
%description
The OpenSceneGraph is an OpenSource, cross platform graphics toolkit for the
@@ -49,133 +52,36 @@
for rapid development of graphics applications.
%prep
-%setup -q -n OSG_OP_OT-%{srcvers}
+%setup -q -c
%patch0 -p0
-# backup, we hack this file later
-cp OpenSceneGraph/Make/dependencies \
- OpenSceneGraph/Make/dependencies.bak
-
-# Propagate RPM_OPT_FLAGS
-for file in OpenSceneGraph/src/osgWrappers/*/GNUmakefile; do
- sed -i -e '/^OPTF.*$/d' $file
-done
-
-for dir in OpenThreads Producer OpenSceneGraph; do
-# Add DESTDIR
-# Remove bogus -lstdc++
-# Install examples to %%{_bindir}
- sed -i \
- -e 's,^\(INST_LOCATION[ ]*?=\).*$,\1 $(DESTDIR)%{_prefix},g' \
- -e 's,^\(INST_INCLUDE[ ]*=\).*$,\1 $(DESTDIR)%{_includedir},g' \
- -e 's,^\(INST_SHARE[ ]*=\).*$,\1 $(DESTDIR)%{_datadir},g' \
- -e 's,^\(INST_LIBS[ ]*=\).*$,\1 $(DESTDIR)%{_libdir},g' \
- -e 's,^\(INST_EXAMPLES[ ]*=\).*$,\1 $(DESTDIR)%{_bindir},g' \
- -e 's,\(^[ \t]*LIBS[ ]*=.*\) -lstdc++,\1,g' \
- -e 's, -lXi,,g' \
- -e 's,^\([ ]*LDFLAGS.*soname.*$\),# \1,g' \
- $dir/Make/makedefs
-
-# Propagate RPM_OPT_FLAGS
- echo "OPTF = $RPM_OPT_FLAGS" >> $dir/Make/makedefs
-
-# Fix quoting bug
- sed -i \
- -e 's, DOF=$(OPTF) , "DOF=$(OPTF)" ,g' \
- $dir/Make/makerules
-
-# Fix broken shell fragments
- sed -i \
- -e 's,do\\,do \\,g' \
- -e 's,else\\,else \\,g' \
- -e 's,fi\\,fi;\\,g' \
- -e 's,done\\,done;\\,g' \
- -e 's,then\\,then \\,g' \
- $dir/Make/*rules
-
- find $dir -name GNUmakefile -exec grep -l '^[ ]*LIB[ ]*=' {} \; | \
- xargs sed -i \
- -e 's,\(^include.*makedefs\)[ ]*$,\1\ninclude \$(TOPDIR)/Make/libdefs,'
-
-# Fix libdir
- sed -i \
- -e 's,^prefix=.*$,prefix = %{_prefix},' \
- -e 's,^includedir=.*$,includedir = %{_includedir},' \
- -e 's,^libdir=.*$,libdir = %{_libdir},' \
- -e 's,^Version:.*$,Version: %{apivers},' \
- -e '/^Conflicts:$/d' \
- $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
-done
-
%build
-rm -rf $RPM_BUILD_ROOT
-%ifarch x86_64
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
-%else
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
-%endif
+mkdir -p BUILD
+pushd BUILD
-# configure
-echo "# Fedora custom settings" > OpenSceneGraph/Make/dependencies
-echo "COMPILE_EXAMPLES = yes" >> OpenSceneGraph/Make/dependencies
-echo "COMPILE_INTROSPECTION = yes" >> OpenSceneGraph/Make/dependencies
-echo "INVENTOR_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
-echo "GLUT_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies
-%{?_with_gdal:echo "GDAL_INSTALLED = yes" >> OpenSceneGraph/Make/dependencies}
-echo >> OpenSceneGraph/Make/dependencies
-cat OpenSceneGraph/Make/dependencies.bak >> OpenSceneGraph/Make/dependencies
-
-for dir in OpenThreads Producer OpenSceneGraph; do
- make -C $dir \
- COMPILE_OSG_OP_OT_WITH_SONAMES=YES \
- OPENTHREADS_INC_DIR="$PWD/OpenThreads/include" \
- OPENTHREADS_LIB_DIR="$PWD/OpenThreads/lib/\$(OS)\$(ARCH)" \
- PRODUCER_INC_DIR="$PWD/Producer/include" \
- PRODUCER_LIB_DIR="$PWD/Producer/lib/\$(OS)\$(ARCH)" \
- %{?_smp_mflags}
-done
-
- doxygen debian/Doxyfile-openthreads
- doxygen debian/Doxyfile-openscenegraph
- doxygen debian/Doxyfile-producer
+# FIXME: Should add -DBUILD_DOCUMENTATION=ON to build the docs, but it's broken
+%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_WRAPPERS=ON ../OpenSceneGraph
+make VERBOSE=1 %{?_smp_mflags}
+
+# FIXME: Manually invoke doxygen, because doc-building is broken in OSG's cmake stuff
+OSGHOME=../OpenSceneGraph doxygen ../OpenSceneGraph/doc/Doxyfiles/core_Doxyfile
+popd
%install
rm -rf $RPM_BUILD_ROOT
-%ifarch x86_64
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
-%else
-export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
-%endif
+pushd BUILD
+make install DESTDIR=${RPM_BUILD_ROOT}
-for dir in OpenThreads Producer OpenSceneGraph; do
- make -C $dir \
- COMPILE_OSG_OP_OT_WITH_SONAMES="YES" \
- OPENTHREADS_INC_DIR="$PWD/OpenThreads/include" \
- OPENTHREADS_LIB_DIR="$PWD/OpenThreads/lib/\$(OS)\$(ARCH)" \
- PRODUCER_INC_DIR="$PWD/Producer/include" \
- PRODUCER_LIB_DIR="$PWD/Producer/lib/\$(OS)\$(ARCH)" \
- install DESTDIR="$RPM_BUILD_ROOT"
-done
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
-
-# HACK ALERT: This should be fixed inside of the makefiles.
-# fix up shared library symlinks
-pushd ${RPM_BUILD_ROOT}%{_libdir} > /dev/null
- for i in lib*.so; do
- if test -f $i; then
- rm -f $i.*
- soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
- mv $i $soname
- ln -s $soname $i
- fi
- done
-popd > /dev/null
-/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
-
-install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
-install -m 644 -D OpenSceneGraph/Make/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
-install -m 644 -D Producer/Make/producer.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/producer.pc
+# 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.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
+install -m 644 -D pkgconfig/openscenegraph.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openscenegraph.pc
+%endif
+popd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -192,30 +98,35 @@
%{_bindir}/osgconv
%{_bindir}/osgversion
%{_bindir}/osgviewer
-%{?_with_gdal:%{_bindir}/osgdem}
-%{_libdir}/osgPlugins
+%{_libdir}/osgPlugins-2.0.*
%{_libdir}/libosg*.so.*
%package devel
-Summary: Devel files for OpenSceneGraph
-Group: Applications/Multimedia
-Requires: %name = %{version}-%{release}
-Requires: Producer-devel = %{version}-%{release}
+Summary: Devel files for OpenSceneGraph
+Group: Applications/Multimedia
+Requires: %name = %{version}-%{release}
+%if %{?_with_pkgconfig}
+Requires: pkgconfig
+%endif
+Requires: OpenThreads-devel
+Obsoletes: Producer-devel <= 1.2-2%{?dist}
%description devel
Development files for OpenSceneGraph.
%files devel
%defattr(-,root,root,-)
-%doc OpenSceneGraph/html
+%doc BUILD/doc/html
%{_includedir}/osg*
+%if %{?_with_pkgconfig}
%{_libdir}/pkgconfig/openscenegraph.pc
+%endif
%{_libdir}/libosg*.so
# OpenSceneGraph-examples
%package examples
-Summary: Sample applications for OpenSceneGraph
-Group: Applications/Multimedia
+Summary: Sample applications for OpenSceneGraph
+Group: Applications/Multimedia
%description examples
Sample applications for OpenSceneGraph
@@ -229,9 +140,15 @@
%{_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
%{_bindir}/osgcluster
+%endif
+%{_bindir}/osgcompositeviewer
%{_bindir}/osgcopy
%{_bindir}/osgcubemap
%{_bindir}/osgdelaunay
@@ -241,6 +158,7 @@
%if "%{version}" < "1.2"
%{_bindir}/osgfbo
%endif
+%{_bindir}/osgfadetext
%{_bindir}/osgforest
%{_bindir}/osgfxbrowser
%{_bindir}/osggeodemo
@@ -248,6 +166,8 @@
%{_bindir}/osghangglide
%{_bindir}/osghud
%{_bindir}/osgimpostor
+%{_bindir}/osgintersection
+%{_bindir}/osgintrospection
%{_bindir}/osgkeyboard
%{_bindir}/osgkeyboardmouse
%{_bindir}/osglauncher
@@ -255,18 +175,18 @@
%{_bindir}/osglightpoint
%{_bindir}/osglogicop
%{_bindir}/osglogo
+%{_bindir}/osgmanipulator
%{_bindir}/osgmotionblur
%{_bindir}/osgmovie
+%if "%{version}" < "2.0"
%{_bindir}/osgmultiplecameras
+%endif
%{_bindir}/osgmultitexture
%{_bindir}/osgoccluder
%{_bindir}/osgpagedlod
%{_bindir}/osgparametric
%{_bindir}/osgparticle
%{_bindir}/osgparticleeffects
-%if "%{version}" < "1.2"
-%{_bindir}/osgpbuffer
-%endif
%{_bindir}/osgpick
%{_bindir}/osgplanets
%{_bindir}/osgpoints
@@ -280,10 +200,13 @@
%{_bindir}/osgsequence
%{_bindir}/osgshaders
%{_bindir}/osgshaderterrain
+%{_bindir}/osgshadow
%{_bindir}/osgshadowtexture
%{_bindir}/osgshape
+%if "%{version}" < "2.0"
%{_bindir}/osgsimple
%{_bindir}/osgsimplepager
+%endif
%{_bindir}/osgsimplifier
%{_bindir}/osgslice
%{_bindir}/osgspacewarp
@@ -291,7 +214,8 @@
%{_bindir}/osgspotlight
%{_bindir}/osgstereoimage
%{_bindir}/osgteapot
-%{_bindir}/osgtesselate
+%{_bindir}/osgterrain
+%{_bindir}/osgtessellate
%{_bindir}/osgtext
%{_bindir}/osgtexture1D
%{_bindir}/osgtexture2D
@@ -299,24 +223,22 @@
%{_bindir}/osgtexturerectangle
%{_bindir}/osgunittests
%{_bindir}/osgvertexprogram
+%{_bindir}/osgviewerGLUT
+%{_bindir}/osgviewerWX
%{_bindir}/osgvolume
%{_bindir}/osgwindows
-%{_bindir}/osgintrospection
-%{?_with_gdal:%{_bindir}/osgphotoalbum}
-%{?_with_gdal:%{_bindir}/osgbluemarble}
-%{?_with_gdal:%{_bindir}/osgsimulation}
-
-%{_bindir}/osgGLUTsimple
-%{_bindir}/osgGLUTkeyboardmouse
+%{_bindir}/osgphotoalbum
+%{_bindir}/osgsimulation
%{_datadir}/OpenSceneGraph
+
# OpenThreads
%package -n OpenThreads
-Summary: OpenThreads
-Group: Applications/Multimedia
-License: LGPL
+Summary: OpenThreads
+Group: Applications/Multimedia
+License: OSGPL
%description -n OpenThreads
OpenThreads is intended to provide a minimal & complete Object-Oriented (OO)
@@ -331,70 +253,43 @@
%files -n OpenThreads
%defattr(-,root,root,-)
-%doc OpenThreads/*.txt
+%doc OpenSceneGraph/*.txt
%{_libdir}/libOpenThreads.so.*
# OpenThreads-devel
%package -n OpenThreads-devel
-Summary: Devel files for OpenThreads
-Group: Applications/Multimedia
-License: LGPL
-Requires: OpenThreads = %{version}-%{release}
+Summary: Devel files for OpenThreads
+Group: Applications/Multimedia
+License: OSGPL
+Requires: OpenThreads = %{version}-%{release}
+%if %{?_with_pkgconfig}
+Requires: pkgconfig
+%endif
%description -n OpenThreads-devel
Development files for OpenThreads.
%files -n OpenThreads-devel
%defattr(-,root,root,-)
-%doc OpenThreads/html
+%if %{?_with_pkgconfig}
%{_libdir}/pkgconfig/openthreads.pc
+%endif
%{_libdir}/libOpenThreads.so
%{_includedir}/OpenThreads
-# Producer
-%package -n Producer
-Summary: Producer
-License: OSGPL
-Group: Applications/Multimedia
-Provides: OpenProducer = %{version}-%{release}
-
-%description -n Producer
-Open Producer (or simply Producer) is a cross-platform, C++ library for
-managing OpenGL rendering contexts in a windowing system independent manner.
-Producer provides a simple, yet powerfully scalable approach for real-time 3D
-applications wishing to run within a single window to large, multidisplay
-systems.
-
-%post -n Producer -p /sbin/ldconfig
-
-%postun -n Producer -p /sbin/ldconfig
-
-%files -n Producer
-%defattr(-,root,root,-)
-%doc Producer/*.txt
-%{_libdir}/libProducer.so.*
-
-# Producer-devel
-%package -n Producer-devel
-Summary: Devel files for Producer
-Group: Applications/Multimedia
-License: OSGPL
-Requires: Producer = %{version}-%{release}
-Requires: OpenThreads-devel = %{version}-%{release}
-Provides: OpenProducer-devel = %{version}-%{release}
+%changelog
+* Fri Jun 29 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-3
+- Re-add (but don't ship) *.pc.
+- Let OpenSceneGraph "Obsolete: Producer".
+- Let OpenSceneGraph-devel "Obsolete: Producer-devel".
-%description -n Producer-devel
-Development files for Producer.
+* Wed Jun 27 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-2
+- Build docs.
-%files -n Producer-devel
-%defattr(-,root,root,-)
-%doc Producer/html
-%{_libdir}/pkgconfig/producer.pc
-%{_libdir}/libProducer.so
-%{_includedir}/Producer
+* Fri Jun 22 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.0-1
+- Upgrade to 2.0.
-%changelog
* Thu Jun 21 2007 Ralf Corsépius <rc040203 at freenet.de> - 1.2-4
- ExcludeArch: ppc64 (BZ 245192, 245196).
More information about the fedora-extras-commits
mailing list