From: lisu <lisu@pld-linux.org>
Date: Tue, 7 Dec 2010 15:35:25 +0000 (+0000)
Subject: - 2.9.10
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f40964b503cc904fb934b2261f8ef47c5bc280e1;p=packages%2FOpenSceneGraph.git

- 2.9.10
- link.patch (link with -lX11 to avoid unresolved symbols)

Changed files:
    OpenSceneGraph.spec -> 1.26.2.4
---

diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 1ba08f7..32b68ca 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -1,14 +1,15 @@
 Summary:	Open Scene Graph - real-time visualization library
 Summary(pl.UTF-8):	Open Scene Graph - biblioteka do wizualizacji
 Name:		OpenSceneGraph
-Version:	2.9.9
+Version:	2.9.10
 Release:	0.beta.1
 License:	OpenSceneGraph Public Licence (based on LGPL with exceptions)
 Group:		X11/Libraries
 Source0:	http://www.openscenegraph.org/downloads/developer_releases/%{name}-%{version}.zip
-# Source0-md5:	0d18aa6ccb8f0fc75ed7ebec1ac3b010
+# Source0-md5:	b07359177cf619cf0d3f7a6dbd30323f
 #Source1:	osg-doxygen-0.9.1.tar.gz
 ## Source1-md5:	7e6d785d1b763aaeae03c2dc4c148805
+Patch0:		%{name}-link.patch
 URL:		http://www.openscenegraph.org/projects/osg/
 BuildRequires:	cairo-devel
 BuildRequires:	cmake
@@ -22,6 +23,7 @@ BuildRequires:	librsvg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	pkgconfig
 BuildRequires:	poppler-glib-devel
+BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	unzip
 #BuildRequires:	xulrunner-devel
 BuildRequires:	zlib-devel
@@ -73,14 +75,12 @@ Wtyczki dla biblioteki Open Scene Graph.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
 cd build
-%cmake .. \
-	-DCMAKE_BUILD_TYPE=None \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_VERBOSE_MAKEFILE=ON
+%cmake ..
 %{__make}
 
 %install
@@ -103,39 +103,39 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libOpenThreads.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libOpenThreads.so.12
 %attr(755,root,root) %{_libdir}/libosg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosg.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosg.so.68
 %attr(755,root,root) %{_libdir}/libosgAnimation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgAnimation.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgAnimation.so.68
 %attr(755,root,root) %{_libdir}/libosgDB.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgDB.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgDB.so.68
 %attr(755,root,root) %{_libdir}/libosgFX.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgFX.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgFX.so.68
 %attr(755,root,root) %{_libdir}/libosgGA.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgGA.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgGA.so.68
 %attr(755,root,root) %{_libdir}/libosgManipulator.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgManipulator.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgManipulator.so.68
 %attr(755,root,root) %{_libdir}/libosgParticle.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgParticle.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgParticle.so.68
 %attr(755,root,root) %{_libdir}/libosgPresentation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgPresentation.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgPresentation.so.68
 %attr(755,root,root) %{_libdir}/libosgShadow.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgQt.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgQt.so.68
 %attr(755,root,root) %{_libdir}/libosgQt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgShadow.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgShadow.so.68
 %attr(755,root,root) %{_libdir}/libosgSim.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgSim.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgSim.so.68
 %attr(755,root,root) %{_libdir}/libosgTerrain.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgTerrain.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgTerrain.so.68
 %attr(755,root,root) %{_libdir}/libosgText.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgText.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgText.so.68
 %attr(755,root,root) %{_libdir}/libosgUtil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgUtil.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgUtil.so.68
 %attr(755,root,root) %{_libdir}/libosgViewer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgViewer.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgViewer.so.68
 %attr(755,root,root) %{_libdir}/libosgVolume.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgVolume.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgVolume.so.68
 %attr(755,root,root) %{_libdir}/libosgWidget.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosgWidget.so.66
+%attr(755,root,root) %ghost %{_libdir}/libosgWidget.so.68
 
 %files plugins
 %defattr(644,root,root,755)