Accepting request 354340 from KDE:Applications

Update to KDE Apps 15.12.1. Please only accept no earlier then next week Wednesday. This to give us a chance to notify people and people to lock their packages as that we are starting to obsolete the kdepim4 suite OBS-URL: https://build.opensuse.org/request/show/354340 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=72
2016-01-23 00:10:08 +00:00 · 2016-01-23 00:10:08 +00:00 · c4386eefa9
commit c4386eefa9
parent 8d23df2e9a e2edefeb93
8 changed files with 123 additions and 272 deletions
--- a/fix-libastro-version-tagging.diff
+++ b/fix-libastro-version-tagging.diff
@ -1,13 +0,0 @@
-Index: marble-15.08.1/src/lib/astro/astrolib_export.h
-===================================================================
--- marble-15.08.1.orig/src/lib/astro/astrolib_export.h
-+++ marble-15.08.1/src/lib/astro/astrolib_export.h
-@@ -11,6 +11,8 @@
- #ifndef ASTROLIB_EXPORT_H
- #define ASTROLIB_EXPORT_H
- 
-+#define QT_NO_VERSION_TAGGING 1
-+
- #include <QtGlobal>
- 
- #ifndef ASTROLIB_EXPORT
--- a/libmarblewidget.changes
+++ b/libmarblewidget.changes
@ -1,32 +0,0 @@
-------------------------------------------------------------------
-Tue Nov 10 20:43:37 UTC 2015 - tittiatcoke@gmail.com
-
- Update to KDE Applications 15.08.3
-   * KDE Applications 15.08.3 
-   * https://www.kde.org/announcements/announce-applications-15.08.3.php
-   * boo#954531
-
-
-------------------------------------------------------------------
-Sun Oct 11 13:45:17 UTC 2015 - tittiatcoke@gmail.com
-
- Update to KDE Applications 15.08.2
-   * KDE Applications 15.08.2 
-   * https://www.kde.org/announcements/announce-applications-15.08.2.php
-   
- Include libastro due to dependencies
-
-------------------------------------------------------------------
-Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com
-
- Update to KDE Applications 15.08.1
-   * KDE Applications 15.08.1 
-   * https://www.kde.org/announcements/announce-applications-15.08.1.php
-
- Drop upstream patch marble_fix_ppc64_build.patch
-------------------------------------------------------------------
-Sun Aug 30 18:20:17 UTC 2015 - tittiatcoke@gmail.com
-
- Initial package to fullfil the buildrequirements for libkgeomap
-  as it is still based on Qt4
-
--- a/libmarblewidget.spec
+++ b/libmarblewidget.spec
@ -1,117 +0,0 @@
-#
-# spec file for package libmarblewidget
-#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-%define _so 22
-
-Name:           libmarblewidget
-Version:        15.08.3
-Release:        0
-Summary:        Generic map viewer library for libkgeomapr
-License:        LGPL-2.1+
-Group:          Amusements/Teaching/Other
-Url:            http://edu.kde.org
-Source0:        marble-%{version}.tar.xz
-BuildRequires:  fdupes
-BuildRequires:  gpsd-devel
-BuildRequires:  perl
-BuildRequires:  libkde4-devel
-BuildRequires:  quazip-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-The shared library for the MarbleWidget shared library.
-
-%package devel
-Summary:        Generic map viewer: Build Environment
-Group:          Development/Libraries/KDE
-Requires:       libmarblewidget%{_so} = %{version}
-Requires:       libastro1 = %{version}
-Conflicts:      marble-devel
-
-%description devel
-Development headers and libraries for Marble.
-
-%package -n libmarblewidget%{_so}
-Summary:        Generic map viewer: Shared Library
-Group:          Development/Libraries/KDE
-
-%description -n libmarblewidget%{_so}
-The shared library for the MarbleWidget shared library.
-
-%package -n libastro1
-Summary:        Astronomy: Shared Library
-Group:          Development/Libraries/KDE
-
-%description -n libastro1
-The Astronomy shared library for the MarbleWidget shared library.
-
-%prep
-%setup -q -n marble-%{version}
-
-%build
-%ifarch ppc ppc64
-export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
-%endif
-%cmake_kde4 -d build -- -DQT5BUILD=OFF
-pushd src/lib/marble
-make
-popd
-pushd src/lib/astro
-make
-
-
-%install
-  pushd build/src/lib/marble
-  %kde4_makeinstall
-  popd
-  pushd build/src/lib/astro
-  %kde4_makeinstall
-  popd
-  mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules
-  cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/
-  %fdupes -s %{buildroot}
-
-%post   -n libmarblewidget%{_so} -p /sbin/ldconfig
-
-%postun -n libmarblewidget%{_so} -p /sbin/ldconfig
-
-
-%post   -n libastro1 -p /sbin/ldconfig
-
-%postun -n libastro1 -p /sbin/ldconfig
-
-%files devel
-%defattr(-,root,root)
-%doc BUGS CODING
-%{_includedir}/marble/
-%{_includedir}/astro/
-%{_libdir}/libmarblewidget.so
-%{_libdir}/libastro.so
-%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
-
-%files -n libmarblewidget%{_so} 
-%defattr(-,root,root)
-%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%{_libdir}/libmarblewidget.so.*
-
-%files -n libastro1
-%defattr(-,root,root)
-%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%{_libdir}/libastro.so.*
-
-
-%changelog
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@ -1,25 +1,38 @@
-diff -urB marble-15.08.2/CMakeLists.txt new/CMakeLists.txt
--- marble-15.08.2/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -121,6 +121,7 @@
-   cmake_minimum_required(VERSION 2.8.12)
-   set(QT4BUILD FALSE)
-   set(MARBLEWIDGET marblewidget-qt5)
-+  set(ASTRO astro-qt5)
+diff -urB marble/CMakeLists.txt new/CMakeLists.txt
+--- marble/CMakeLists.txt	2015-10-23 19:36:58.656015667 +0200
+++ new/CMakeLists.txt	2015-10-23 19:39:18.128704325 +0200
+@@ -94,6 +94,7 @@
 
-   include_directories( ${Qt5Svg_INCLUDE_DIRS} )
-   include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
-@@ -135,6 +136,7 @@
-   set(WITH_KF5 FALSE)
-   set(QT4BUILD TRUE)
-   set(MARBLEWIDGET marblewidget)
-+  set(ASTRO astro)
-   find_package(Qt4 REQUIRED)
-   set( QT_USE_QTXML         ON )
-   set( QT_USE_QTNETWORK     ON )
-diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble-15.08.2/src/apps/marble-kde/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
+ cmake_minimum_required(VERSION 2.8.12)
+ set(MARBLEWIDGET marblewidget-qt5)
+set(ASTRO astro-qt5)
+ 
+ include_directories( ${Qt5Svg_INCLUDE_DIRS} )
+ include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
+diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
+--- marble/src/apps/behaim/CMakeLists.txt	2015-10-23 19:36:58.892016832 +0200
+++ new/src/apps/behaim/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
+@@ -29,7 +29,7 @@
+       ${Qt5Positioning_LIBRARIES}
+       ${Qt5AndroidExtras_LIBRARIES}
+       ${Qt5Multimedia_LIBRARIES}
+-      astro
+      ${ASTRO}
+       ${MARBLEWIDGET}
+       marbledeclarative)
+ 
+@@ -47,7 +47,7 @@
+     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
+     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarbleBehaim.so")
+-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
+     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.behaim")
+     set(QT_ANDROID_APP_NAME "Marble Globe: Behaim's Erdapfel")
+diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
+--- marble/src/apps/marble-kde/CMakeLists.txt	2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
@@ -54,7 +54,7 @@
     marble
     marbleui
@ -29,52 +42,43 @@ diff -urB marble-15.08.2/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-
     KF5::NewStuff
     KF5::Wallet
     KF5::Parts
-diff -urB marble-15.08.2/src/apps/marble_maps/CMakeLists.txt new/src/apps/marble_maps/CMakeLists.txt
--- marble-15.08.2/src/apps/marble_maps/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/apps/marble_maps/CMakeLists.txt	2015-10-11 18:06:50.981995015 +0200
-@@ -14,7 +14,7 @@
-       ${Qt5WebKitWidgets_LIBRARIES}
-       ${Qt5WebKit_LIBRARIES}
+diff -urB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
+--- marble/src/apps/marble-maps/CMakeLists.txt	2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-maps/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
+@@ -29,7 +29,7 @@
+       ${Qt5Positioning_LIBRARIES}
+       ${Qt5AndroidExtras_LIBRARIES}
+       ${Qt5Multimedia_LIBRARIES}
+-      astro
+      ${ASTRO}
       ${MARBLEWIDGET}
-      astro)
-+      ${ASTRO})
-     
- file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets")
- file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
-@@ -32,7 +32,7 @@
-     PACKAGE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/package"
-     PACKAGE_NAME org.kde.marble.maps
-     ${KEYSTORE_OPTIONS}
-    DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro.so"
-+    DEPENDS "${PROJECT_BINARY_DIR}/lib/libmarblewidget-qt5.so" "${PROJECT_BINARY_DIR}/lib/libastro-qt5.so"
- )
+       marbledeclarative)
 
- # Move target from default build to install phase so we can create everything in one go
-diff -urB marble-15.08.2/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble-15.08.2/src/apps/marble-qt/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -40,7 +40,7 @@
-     ${QT_QTDBUS_LIBRARY}
-     marbleui
-     ${MARBLEWIDGET}
-    astro)
-+    ${ASTRO})
- else()
-   target_link_libraries (
-     marble-qt
-@@ -53,7 +53,7 @@
-     ${Qt5WebKit_LIBRARIES}
-     marbleui
-     ${MARBLEWIDGET}
-    astro)
-+    ${ASTRO})
- endif()
+@@ -47,7 +47,7 @@
+     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
+     set(QT_ANDROID_NDK_ROOT $ENV{ANDROID_NDK})
+     set(QT_ANDROID_APP_PATH "${ABSOLUTE_INSTALL_PATH}/libs/${ANDROID_ABI}/libMarble.so")
+-    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+    set(QT_ANDROID_APP_EXTRA_LIBS "${ABSOLUTE_INSTALL_PATH}/lib/libastro-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarblewidget-qt5.so,${ABSOLUTE_INSTALL_PATH}/lib/libmarbledeclarative.so")
+     set(QT_ANDROID_APP_PACKAGE_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/package")
+     set(QT_ANDROID_APP_PACKAGE_NAME "org.kde.marble.maps")
+     set(QT_ANDROID_APP_NAME "Marble Maps")
+diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
+--- marble/src/apps/marble-qt/CMakeLists.txt	2015-10-23 19:36:58.896016851 +0200
+++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-23 19:40:22.905024163 +0200
+@@ -34,7 +34,7 @@
+ ${Qt5WebKit_LIBRARIES}
+ marbleui
+ ${MARBLEWIDGET}
+-astro)
+${ASTRO})
 
 if(WIN32)
-diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble-15.08.2/src/lib/astro/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/lib/astro/CMakeLists.txt	2015-10-11 18:08:05.239677950 +0200
-@@ -20,23 +20,23 @@
+   target_link_libraries(
+diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
+--- marble/src/lib/astro/CMakeLists.txt	2015-10-23 19:36:58.908016911 +0200
+++ new/src/lib/astro/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
+@@ -21,27 +21,27 @@
   solarsystem.cpp
 )
 
@ -100,10 +104,15 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis
 
 -SET_TARGET_PROPERTIES(astro PROPERTIES
 +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
-   VERSION ${GENERIC_LIB_VERSION}
-   SOVERSION ${GENERIC_LIB_SOVERSION}
-   DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
-@@ -44,11 +44,11 @@
+     DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
+   )
+ if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+-  SET_TARGET_PROPERTIES(astro PROPERTIES
+  SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
+     VERSION ${GENERIC_LIB_VERSION}
+     SOVERSION ${GENERIC_LIB_SOVERSION}
+   )
+@@ -49,11 +49,11 @@
 
 # choose the correct target install library path
 if(WIN32)
@ -118,55 +127,42 @@ diff -urB marble-15.08.2/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLis
 endif()
 
 ########### install files ###############
-diff -urB marble-15.08.2/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble-15.08.2/src/lib/marble/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/lib/marble/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -372,7 +372,7 @@
+diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
+--- marble/src/lib/marble/CMakeLists.txt	2015-10-23 19:36:58.912016931 +0200
+++ new/src/lib/marble/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
+@@ -364,7 +364,7 @@
 ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
 
 # link with libastro
 -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
 +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
 
- # link with release version of Qt libs
- if( QT4BUILD )
-diff -urB marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/eclipses/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -26,4 +26,4 @@
+ # link against zlib
+ TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ZLIB_LIBRARIES})
+diff -urB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
+--- marble/src/plugins/render/eclipses/CMakeLists.txt	2015-10-23 19:36:58.964017187 +0200
+++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-23 19:37:28.732164170 +0200
+@@ -22,4 +22,4 @@
 
 marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
 
 -target_link_libraries( EclipsesPlugin astro )
 +target_link_libraries( EclipsesPlugin ${ASTRO} )
-diff -urB marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/satellites/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 18:08:39.680458497 +0200
-@@ -37,4 +37,4 @@
+diff -urB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
+--- marble/src/plugins/render/satellites/CMakeLists.txt	2015-10-23 19:36:58.972017228 +0200
+++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-23 19:37:28.736164190 +0200
+@@ -30,4 +30,4 @@
  ${satellites_SRCS}
  ${sgp4_SRCS} )
 
-target_link_libraries( SatellitesPlugin astro )
-+target_link_libraries( SatellitesPlugin ${ASTRO} )
-diff -urB marble-15.08.2/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble-15.08.2/src/plugins/render/stars/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -16,4 +16,4 @@
+-target_link_libraries( SatellitesPlugin astro sgp4 )
+target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
+diff -urB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
+--- marble/src/plugins/render/stars/CMakeLists.txt	2015-10-23 19:36:58.976017247 +0200
+++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-23 19:37:28.736164190 +0200
+@@ -13,4 +13,4 @@
 qt_wrap_ui(stars_SRCS  ${stars_UI})
 
 marble_add_plugin( StarsPlugin ${stars_SRCS} )
 -target_link_libraries( StarsPlugin astro )
 +target_link_libraries( StarsPlugin ${ASTRO} )
-diff -urB marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
--- marble-15.08.2/tools/osm-sisyphus/CMakeLists.txt	2015-10-02 14:41:37.000000000 +0200
-+++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 18:05:32.988227408 +0200
-@@ -24,7 +24,7 @@
- add_executable( ${TARGET} ${${TARGET}_SRC} )
- 
- if(QT4BUILD)
-   target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} marblewidget )
-+   target_link_libraries( ${TARGET} ${QT_QTCORE_LIBRARY} ${QT_QTMAIN_LIBRARY} ${QT_QTSQL_LIBRARY} ${MARBLEWIDGET} )
- else()
-  target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} marblewidget-qt5 )
-+  target_link_libraries( ${TARGET} ${Qt5Core_LIBRARIES} ${Qt5Sql_LIBRARIES} ${MARBLEWIDGET} )
- endif()
--- a/marble-15.08.3.tar.xz
+++ b/marble-15.08.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:743131cd37e6c42b178497fa3cda012b926587b4ebc094bb7276e02fb4e62844
-size 23272964
--- a/marble-15.12.1.tar.xz
+++ b/marble-15.12.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:957297f5187f5e4f75d5a1379742bc4fd0d5c72b7e906d951d1828246a5bfe97
+size 23768028
--- a/marble.changes
+++ b/marble.changes
@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Sat Jan  9 18:34:52 UTC 2016 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.12.1
+   * KDE Applications 15.12.1 
+   * https://www.kde.org/announcements/announce-applications-15.12.1.php
+   * boo#961265
+
+
+-------------------------------------------------------------------
+Sun Dec 13 13:32:37 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.12.0
+   * KDE Applications 15.12.0 
+   * https://www.kde.org/announcements/announce-applications-15.12.0.php
+   * boo#958887
+
+- Drop upstreamed patches:
+   * fix-libastro-version-tagging.diff
+-------------------------------------------------------------------
 Tue Nov 10 20:22:14 UTC 2015 - tittiatcoke@gmail.com

 - Update to KDE Applications 15.08.3
--- a/marble.spec
+++ b/marble.spec
@ -15,18 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-%define _so -22
+%define _so -23

 Name:           marble
-Version:        15.08.3
+Version:        15.12.1
 Release:        0
 Summary:        Generic map viewer
 License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE fix-libastro-version-tagging.diff alarrosa@suse.com -- Declare QT_NO_VERSION_TAGGING
-Patch0:         fix-libastro-version-tagging.diff
 # PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- Make astro coinstallable with its Qt4 version
 Patch1:         make_astro_coinstall.diff
 BuildRequires:  fdupes
@ -53,6 +51,7 @@ BuildRequires:  kf5-filesystem
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kwallet-devel
 BuildRequires:  knewstuff-devel
+BuildRequires:  kcrash-devel
 BuildRequires:  kparts-devel
 BuildRequires:  kcoreaddons-devel
 BuildRequires:  kdoctools-devel
@ -135,7 +134,6 @@ The Astronomy shared library for the MarbleWidget shared library.

 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1

 %build
@ -158,6 +156,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
      -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \
      -DBUILD_TESTING=OFF \
      -DBUILD_MARBLE_TESTS=NO \
+      -DMOBILE=FALSE \
      -DWITH_KF5=TRUE \
      ..
 %make_jobs
@ -165,10 +164,8 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %install
  %kf5_makeinstall -C build
  %fdupes -s %{buildroot}
-  rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop
  rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
  rm -rf %{buildroot}/designer
-  rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile
  rm -rf %{buildroot}%{_kf5_bindir}/marble-touch
  %fdupes -s %{buildroot}

@ -195,6 +192,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %{_kf5_configkcfgdir}/
 %{_kf5_iconsdir}/hicolor/*/apps/marble.*
 %{_kf5_kxmlguidir}/marble/
+%_libdir/libmarbledeclarative.so
 %{_kf5_libdir}/marble/
 %{_kf5_libdir}/plugins/designer/
 %{_kf5_plugindir}/libmarble*so