[OpenSceneGraph] Upgrade to 3.2.1.
corsepiu
corsepiu at fedoraproject.org
Thu Jul 10 15:03:09 UTC 2014
commit 425bf2d85789741996d853f8f3e4802f5ffca22c
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Thu Jul 10 17:03:18 2014 +0200
Upgrade to 3.2.1.
- Rebase patches.
.gitignore | 2 +-
0001-Cmake-fixes.patch | 16 ++++++++--------
0002-Fix-invalid-char.patch | 10 +++++-----
0003-Activate-osgviewerWX.patch | 4 ++--
OpenSceneGraph.spec | 24 ++++++++++++++----------
sources | 2 +-
6 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c4bdabd..2e0f31d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/OpenSceneGraph-3.2.0.zip
+/OpenSceneGraph-3.2.1.zip
diff --git a/0001-Cmake-fixes.patch b/0001-Cmake-fixes.patch
index e07136b..77bde0e 100644
--- a/0001-Cmake-fixes.patch
+++ b/0001-Cmake-fixes.patch
@@ -1,4 +1,4 @@
-From a496de4b577ca127498e25284e5d9b8736c6dc37 Mon Sep 17 00:00:00 2001
+From 324857354b1d68539ce1af5df0c2540d250a113c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 14 Aug 2013 12:30:03 +0200
Subject: [PATCH 1/3] Cmake fixes.
@@ -11,10 +11,10 @@ Subject: [PATCH 1/3] Cmake fixes.
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be8f2b4..95b322b 100644
+index 3bf8dd7..5f5a18b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -988,7 +988,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -1001,7 +1001,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -23,7 +23,7 @@ index be8f2b4..95b322b 100644
# now set up openthreads documentation generation
IF(BUILD_REF_DOCS_TAGFILE)
-@@ -1004,7 +1004,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -1017,7 +1017,7 @@ IF(BUILD_DOCUMENTATION)
${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
)
#INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
@@ -46,12 +46,12 @@ index e376b78..9162109 100644
$ENV{FLTK_DIR}
~/Library/Frameworks
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
-index aa607fa..36df873 100644
+index 33b4750..dc2ab00 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
-@@ -447,7 +447,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+@@ -453,7 +453,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
IF(APPLE)
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
ELSE(APPLE)
- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
@@ -72,5 +72,5 @@ index 8498958..c66420f 100644
ENDIF()
--
-1.8.3.1
+1.9.3
diff --git a/0002-Fix-invalid-char.patch b/0002-Fix-invalid-char.patch
index 55fe92a..ad31198 100644
--- a/0002-Fix-invalid-char.patch
+++ b/0002-Fix-invalid-char.patch
@@ -1,4 +1,4 @@
-From eeac1c0f80572a6fbecb53f7f3c0c43b0e37e58e Mon Sep 17 00:00:00 2001
+From 861b18e4fba79a547724b338b923276772ddae27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 14 Aug 2013 12:31:47 +0200
Subject: [PATCH 2/3] Fix invalid char.
@@ -8,18 +8,18 @@ Subject: [PATCH 2/3] Fix invalid char.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
-index a4f2b2b..3368f0f 100644
+index 78d42e9..f4b1976 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
-@@ -377,7 +377,7 @@ Nicolas Brodu
+@@ -384,7 +384,7 @@ Nicolas Brodu
Nick Black
Mojtaba Fathi
Mirko Viviani
-Mikkel Gjøl
+Mikkel Gjøl
+ Mike Krus
Mike Garrity
Miha Ravsel
- Michael Polak
--
-1.8.3.1
+1.9.3
diff --git a/0003-Activate-osgviewerWX.patch b/0003-Activate-osgviewerWX.patch
index b82c50b..e44d5a4 100644
--- a/0003-Activate-osgviewerWX.patch
+++ b/0003-Activate-osgviewerWX.patch
@@ -1,4 +1,4 @@
-From fd9157fc6f7258d14b8dee753184c410d3c90293 Mon Sep 17 00:00:00 2001
+From 02b9179040796dba7e1d0355f55f8743493630a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 14 Aug 2013 12:36:32 +0200
Subject: [PATCH 3/3] Activate osgviewerWX.
@@ -26,5 +26,5 @@ index 22b58b7..dffc586 100644
IF ( (QT4_FOUND OR Qt5Widgets_FOUND) AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
--
-1.8.3.1
+1.9.3
diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 0dbd63c..e407f48 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -4,12 +4,12 @@
# package are under the same license as the package itself.
#
-%define apivers 3.2.0
-%define srcvers 3.2.0
+%define apivers 3.2.1
+%define srcvers 3.2.1
Name: OpenSceneGraph
Version: %{apivers}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: High performance real-time graphics toolkit
Group: Applications/Multimedia
@@ -17,13 +17,13 @@ Group: Applications/Multimedia
License: wxWidgets
URL: http://www.openscenegraph.org/
# Announced as stable, but published under developer_releases ;)
-Source0: http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{srcvers}.zip
+Source0: http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-%{srcvers}.zip
-Patch1: 0001-Cmake-fixes.patch
-Patch2: 0002-Fix-invalid-char.patch
+Patch1: 0001-Cmake-fixes.patch
+Patch2: 0002-Fix-invalid-char.patch
# Upstream deactivated building osgviewerWX for obscure reasons
# Reactivate for now.
-Patch3: 0003-Activate-osgviewerWX.patch
+Patch3: 0003-Activate-osgviewerWX.patch
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -146,8 +146,8 @@ Runtime libraries files for OpenSceneGraph.
%package devel
Summary: Development files for OpenSceneGraph
Group: Applications/Multimedia
-Requires: OpenSceneGraph-libs = %{version}-%{release}
-Requires: OpenThreads-devel
+Requires: OpenSceneGraph-libs = %{version}-%{release}
+Requires: OpenThreads-devel
%description devel
Development files for OpenSceneGraph.
@@ -470,7 +470,7 @@ Summary: Devel files for OpenThreads
Group: Applications/Multimedia
License: wxWidgets
Requires: OpenThreads = %{version}-%{release}
-Requires: pkgconfig
+Requires: pkgconfig
%description -n OpenThreads-devel
Development files for OpenThreads.
@@ -482,6 +482,10 @@ Development files for OpenThreads.
%{_includedir}/OpenThreads
%changelog
+* Thu Jul 10 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.2.1-1
+- Upgrade to 3.2.1.
+- Rebase patches.
+
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8b77202..6cb94e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4980f8692712a24d4c99f363f80c6814 OpenSceneGraph-3.2.0.zip
+4f95206a1eef218bd007c3b43e1334f5 OpenSceneGraph-3.2.1.zip
More information about the scm-commits
mailing list