[marble] 1:14.12.3-3

Wed Mar 11 13:02:35 UTC 2015

commit 0bdd9fab869727de886ac6be0a84ebf63154dfcc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 11 08:02:34 2015 -0500

    1:14.12.3-3
    
    - install complete cityplacemarks.cache (#1093552)
    - disable -mobile (doesn't work very well)

 marble-14.12.3-app_versions.patch | 67 +++++++++++++++++++++++++++++++++++++++
 marble-4.12.0-app_versions.patch  | 32 -------------------
 marble.spec                       | 28 +++++++++++++---
 3 files changed, 90 insertions(+), 37 deletions(-)
---

diff --git a/marble-14.12.3-app_versions.patch b/marble-14.12.3-app_versions.patch
new file mode 100644
index 0000000..c88c148
--- /dev/null
+++ b/marble-14.12.3-app_versions.patch
@@ -0,0 +1,67 @@
+diff -up marble-14.12.3/CMakeLists.txt.app_versions marble-14.12.3/CMakeLists.txt
+--- marble-14.12.3/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
++++ marble-14.12.3/CMakeLists.txt	2015-03-11 07:29:17.853081170 -0500
+@@ -26,7 +26,8 @@ include( MarbleMacros )
+ # Generate the tiles with the tilecreator at compile time
+ # if this option is set, srtm.jpg will not be installed but the generated tiles instead
+ option(QTONLY "Create Marble version without KDE dependencies" OFF)
+-option(MOBILE "Create a Marble version optimized for handheld devices")
++option(MOBILE "Create a Marble version optimized for handheld devices" ON)
++option(TOUCH  "Create a Marble version optimized for meego/touch devices" OFF)
+ 
+ ####################################################
+ # Specific options for if building with Qt or kde4 libs
+@@ -55,6 +56,7 @@ if(QT4_FOUND)
+     FIND_PACKAGE(QtDeclarative)
+     include_directories(${QT_QTDECLARATIVE_INCLUDE_DIR})
+   ENDIF()
++  set(MARBLEWIDGET marblewidget)
+ else()
+   set( QT5BUILD TRUE )
+   IF( NOT QTONLY )
+@@ -85,6 +87,7 @@ else()
+   include_directories( ${Qt5Xml_INCLUDE_DIRS} )
+   include_directories( ${Qt5Sql_INCLUDE_DIRS} )
+ 
++  set(MARBLEWIDGET marblewidget-qt5) 
+   SET(CMAKE_AUTOMOC TRUE)
+   SET(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
+ endif()
+diff -up marble-14.12.3/data/CMakeLists.txt.app_versions marble-14.12.3/data/CMakeLists.txt
+--- marble-14.12.3/data/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
++++ marble-14.12.3/data/CMakeLists.txt	2015-03-11 07:58:05.895148797 -0500
+@@ -237,11 +237,11 @@ placemarks/boundaryplacemarks.cache
+ placemarks/moonterrain.cache
+ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
+ 
+-if(MOBILE)
+-    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
+-else(MOBILE)
++#if(MOBILE)
++#    install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
++#else(MOBILE)
+     install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
+-endif(MOBILE)
++#endif(MOBILE)
+ 
+ if(NOT APPLE AND NOT WIN32)
+   install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
+diff -up marble-14.12.3/src/apps/CMakeLists.txt.app_versions marble-14.12.3/src/apps/CMakeLists.txt
+--- marble-14.12.3/src/apps/CMakeLists.txt.app_versions	2015-02-23 02:27:55.000000000 -0600
++++ marble-14.12.3/src/apps/CMakeLists.txt	2015-03-11 07:29:17.851081128 -0500
+@@ -1,11 +1,15 @@
+ add_subdirectory(marble-ui)
+ add_subdirectory(marble-qt)
++if ( MOBILE )
+ add_subdirectory(marble-mobile)
++endif ( MOBILE )
+ 
+ if (NOT QTONLY)
+   add_subdirectory(marble-kde)
+ endif()
+ 
++if( TOUCH )
+ if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+     add_subdirectory(marble-touch)
+ endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
++endif( TOUCH )
diff --git a/marble.spec b/marble.spec
index ca6fb58..a11ca09 100644
--- a/marble.spec
+++ b/marble.spec
@@ -5,12 +5,14 @@
 %global designer 1
 ## libmarblewidget-qt5 build (for subsurface)
 %global qt5 1
+## disable mobile for now, doesn't work very well
+%global mobile 1
 
 Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 14.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 #URL:    https://projects.kde.org/projects/kde/kdeedu/marble
@@ -28,11 +30,12 @@ Source0:  http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-
 Patch0: marble-4.11.90-qextserialport.patch
 
 ## upstreamable patches
-# add/fix support for MOBILE/TOUCH marble app versions
+# 1. add/fix support for MOBILE/TOUCH marble app versions
 # TOUCH default off, since app fails to launch (for me):
 #qrc:/main.qml:13:1: Type MarbleWindow unavailable
 #qrc:/MarbleWindow.qml:11:1: module "com.nokia.meego" is not installed
-Patch50:  marble-4.12.0-app_versions.patch
+# 2. unconditionally install larger cityplacemarks.cache
+Patch50:  marble-14.12.3-app_versions.patch
 # support parallel-installable qt4/qt5 libmarblewidget
 Patch51:  marble-14.12.1-marblewidget.patch
 # fix FTBFS with Qt5
@@ -131,6 +134,12 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 %package common
 Summary:  Common files of %{name}
 BuildArch: noarch
+%if ! 0%{?mobile}
+Obsoletes: marble-mobile < %{epoch}:%{version}-%{release}
+%endif
+%if ! 0%{?touch}
+Obsoletes: marble-touch < %{epoch}:%{version}-%{release}
+%endif
 %description common
 {summary}.
 
@@ -234,7 +243,8 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} .. \
   -DEXPERIMENTAL_PYTHON_BINDINGS:BOOL=%{?python:ON}%{!?python:OFF} \
-  -DWITH_DESIGNER_PLUGIN:BOOL=%{?designer:ON}%{!?designer:OFF}
+  -DMOBILE:BOOL=%{?mobile:ON}%{!?mobile:OFF} \
+  -DWITH_DESIGNER_PLUGIN:BOOL=%{?designer:ON}%{!?designer:OFF} \
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -269,8 +279,10 @@ rm -frv %{buildroot}%{_libdir}/marble/plugins/
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble.desktop
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble-mobile.desktop
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble-qt.desktop
+%if 0%{?mobile}
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble-mobile.desktop
+%endif
 %if 0%{?touch}
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble-touch.desktop
 %endif
@@ -343,9 +355,11 @@ fi
 %dir %{_kde4_appsdir}/marble/
 %dir %{_datadir}/marble/
 
+%if 0%{?mobile}
 %files mobile
 %{_kde4_bindir}/marble-mobile
 %{_kde4_datadir}/applications/kde4/marble-mobile.desktop
+%endif
 
 %files qt
 %{_kde4_bindir}/marble-qt
@@ -413,6 +427,10 @@ fi
 
 
 %changelog
+* Wed Mar 11 2015 Rex Dieter <rdieter at fedoraproject.org> - 1:14.12.3-3
+- install complete cityplacemarks.cache (#1093552)
+- disable -mobile (doesn't work very well)
+
 * Sun Mar 08 2015 Rex Dieter <rdieter at fedoraproject.org> 1:14.12.3-2
 - rebuild (libgps)
 
