From 68d8fd6a4d8fa0301516a1532b4ed0cba46cf832 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Feb 04 2012 02:35:01 +0000
Subject: python-marble: fix versioned dependency


---

diff --git a/marble-4.8.0-opt.patch b/marble-4.8.0-opt.patch
new file mode 100644
index 0000000..6c23b8c
--- /dev/null
+++ b/marble-4.8.0-opt.patch
@@ -0,0 +1,71 @@
+diff -up marble-4.8.0/src/CMakeLists.txt.opt marble-4.8.0/src/CMakeLists.txt
+--- marble-4.8.0/src/CMakeLists.txt.opt	2011-12-20 13:19:11.000000000 -0600
++++ marble-4.8.0/src/CMakeLists.txt	2012-02-03 20:33:12.895703342 -0600
+@@ -91,10 +91,8 @@ ENDMACRO (QT4_ADD_RESOURCES2)
+ ENDIF(MINGW)
+ 
+ if (QTONLY)
+-  # ce: don't know why this is needed here - on win32 
+-  # 'O2' is activated by default in release mode
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} -O3)
++    add_definitions (${QT_DEFINITIONS})
+   endif(NOT WIN32)
+ 
+   include_directories(
+@@ -102,7 +100,7 @@ if (QTONLY)
+   )
+ else (QTONLY)
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -O3) 
++    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) 
+   endif(NOT WIN32)
+ 
+   include_directories(
+diff -up marble-4.8.0/src/lib/CMakeLists.txt.opt marble-4.8.0/src/lib/CMakeLists.txt
+--- marble-4.8.0/src/lib/CMakeLists.txt.opt	2011-12-20 13:19:11.000000000 -0600
++++ marble-4.8.0/src/lib/CMakeLists.txt	2012-02-03 20:33:40.822354206 -0600
+@@ -31,9 +31,8 @@ set(GENERIC_LIB_VERSION "0.13.0")
+ set(GENERIC_LIB_SOVERSION "13")
+ 
+ if (QTONLY)
+-  # ce: don't know why this is needed here - on win32 'O2' is activated by default in release mode
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} -O3)
++    add_definitions (${QT_DEFINITIONS})
+   endif(NOT WIN32)
+ 
+   include_directories(
+@@ -41,7 +40,7 @@ if (QTONLY)
+   )
+ else (QTONLY)
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -O3)
++    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+   endif(NOT WIN32)
+ 
+   include_directories(
+diff -up marble-4.8.0/tests/CMakeLists.txt.opt marble-4.8.0/tests/CMakeLists.txt
+--- marble-4.8.0/tests/CMakeLists.txt.opt	2011-12-20 13:19:11.000000000 -0600
++++ marble-4.8.0/tests/CMakeLists.txt	2012-02-03 20:32:54.705930743 -0600
+@@ -71,10 +71,8 @@ endif( CMAKE_COMMAND AND CMAKE_CTEST_COM
+ 
+ # GeoPolygon test
+ if (QTONLY)
+-  # ce: don't know why this is needed here - on win32 
+-  # 'O2' is activated by default in release mode
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} -O3)
++    add_definitions (${QT_DEFINITIONS})
+   endif(NOT WIN32)
+ 
+   include_directories(
+@@ -82,7 +80,7 @@ if (QTONLY)
+   )
+ else (QTONLY)
+   if(NOT WIN32)
+-    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -O3) 
++    add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) 
+   endif(NOT WIN32)
+ 
+   include_directories(
diff --git a/marble.spec b/marble.spec
index 1f6564f..f6fecaa 100644
--- a/marble.spec
+++ b/marble.spec
@@ -3,7 +3,7 @@ Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 4.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 #URL:     https://projects.kde.org/projects/kde/kdeedu/marble
@@ -16,6 +16,10 @@ URL:     http://edu.kde.org/marble/
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.bz2
 
+## upstreamable patches
+# drop hardcoded (-O3) optimizations
+Patch50: marble-4.8.0-opt.patch
+
 ## upstream patches
 
 BuildRequires: desktop-file-utils
@@ -78,6 +82,8 @@ Requires: pykde4 >= %{version}
 %prep
 %setup -q
 
+%patch50 -p1 -b .opt
+
 
 %build
 mkdir -p %{_target_platform}