From 3b0075a92e8f7ee662d313586d8c8c9ed7234c55165425a02bdb8f40f8a78e62 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 13:45:45 +0000
Subject: [PATCH 1/8] update to (15.08.2)

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=58
---
 marble-15.08.1.tar.xz | 3 ---
 marble-15.08.2.tar.xz | 3 +++
 marble.changes        | 8 ++++++++
 marble.spec           | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 marble-15.08.1.tar.xz
 create mode 100644 marble-15.08.2.tar.xz

diff --git a/marble-15.08.1.tar.xz b/marble-15.08.1.tar.xz
deleted file mode 100644
index 4dd4c46..0000000
--- a/marble-15.08.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037
-size 23273312
diff --git a/marble-15.08.2.tar.xz b/marble-15.08.2.tar.xz
new file mode 100644
index 0000000..2e51d87
--- /dev/null
+++ b/marble-15.08.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3c4630fbf598caf54ee7c04500e9476462bc5c53105ffcb170d71c8f7361b02
+size 23272016
diff --git a/marble.changes b/marble.changes
index ccd5a6f..5dc7686 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
+
+
 -------------------------------------------------------------------
 Fri Oct  9 13:39:41 UTC 2015 - alarrosa@suse.com
 
diff --git a/marble.spec b/marble.spec
index 84351e7..2ead64f 100644
--- a/marble.spec
+++ b/marble.spec
@@ -18,7 +18,7 @@
 %define _so -22
 
 Name:           marble
-Version:        15.08.1
+Version:        15.08.2
 Release:        0
 Summary:        Generic map viewer
 License:        LGPL-2.1+

From e86f407fc64bce824bfb6a8b912966878cac476b457ca7645595e35c868ec2ee Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 14:34:26 +0000
Subject: [PATCH 2/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=59

---
 make_astro_coinstall.diff | 198 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 make_astro_coinstall.diff

diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff
new file mode 100644
index 0000000..4afb67c
--- /dev/null
+++ b/make_astro_coinstall.diff
@@ -0,0 +1,198 @@
+diff -urB marble/CMakeLists.txt new/CMakeLists.txt
+--- marble/CMakeLists.txt	2015-10-11 16:02:31.052927316 +0200
++++ new/CMakeLists.txt	2015-10-11 16:14:01.424573511 +0200
+@@ -100,6 +100,7 @@
+   cmake_minimum_required(VERSION 2.8.12)
+   set(QT4BUILD FALSE)
+   set(MARBLEWIDGET marblewidget-qt5)
++  set(ASTRO astro-qt5)
+ 
+   include_directories( ${Qt5Svg_INCLUDE_DIRS} )
+   include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
+@@ -114,6 +115,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/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
+--- marble/src/apps/behaim/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
++++ new/src/apps/behaim/CMakeLists.txt	2015-10-11 16:26:33.617620798 +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-11 16:02:31.312933206 +0200
++++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 16:26:09.313069972 +0200
+@@ -54,7 +54,7 @@
+     marble
+     marbleui
+     ${MARBLEWIDGET}
+-    astro
++    ${ASTRO}
+     KF5::NewStuff
+     KF5::Wallet
+     KF5::Parts
+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-11 16:02:31.312933206 +0200
++++ new/src/apps/marble-maps/CMakeLists.txt	2015-10-11 16:25:56.024768817 +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}/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-11 16:02:31.312933206 +0200
++++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 16:26:59.470206705 +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()
+ 
+ if(WIN32)
+diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
+--- marble/src/lib/astro/CMakeLists.txt	2015-10-11 16:02:31.324933478 +0200
++++ new/src/lib/astro/CMakeLists.txt	2015-10-11 16:18:09.918205232 +0200
+@@ -22,27 +22,27 @@
+   solarsystem.cpp
+ )
+ 
+-ADD_LIBRARY(astro SHARED ${astrolib_SRCS})
++ADD_LIBRARY(${ASTRO} SHARED ${astrolib_SRCS})
+ 
+ if (APPLE)
+   #defined in top level makefile
+-  TARGET_LINK_LIBRARIES(astro ${MAC_EXTRA_LIBS})
++  TARGET_LINK_LIBRARIES(${ASTRO} ${MAC_EXTRA_LIBS})
+ endif (APPLE)
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+-  TARGET_LINK_LIBRARIES(astro m)
++  TARGET_LINK_LIBRARIES(${ASTRO} m)
+ endif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+ 
+ if(WIN32)
+-  TARGET_LINK_LIBRARIES(astro ws2_32 imm32 winmm)
++  TARGET_LINK_LIBRARIES(${ASTRO} ws2_32 imm32 winmm)
+ endif(WIN32)
+ 
+ 
+-SET_TARGET_PROPERTIES(astro PROPERTIES
++SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
+     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}
+   )
+@@ -50,11 +50,11 @@
+ 
+ # choose the correct target install library path
+ if(WIN32)
+-  INSTALL(TARGETS astro RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
++  INSTALL(TARGETS ${ASTRO} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+ elseif(APPLE)
+-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
++  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
+ else()
+-  INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS ${ASTRO} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ ########### install files ###############
+diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
+--- marble/src/lib/marble/CMakeLists.txt	2015-10-11 16:02:31.328933569 +0200
++++ new/src/lib/marble/CMakeLists.txt	2015-10-11 16:13:31.491895133 +0200
+@@ -372,7 +372,7 @@
+ ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+ 
+ # link with libastro
+-TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
++TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
+ 
+ # 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-11 16:02:31.388934928 +0200
++++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 16:21:07.418228001 +0200
+@@ -26,4 +26,4 @@
+ 
+ marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
+ 
+-target_link_libraries( EclipsesPlugin astro )
++target_link_libraries( EclipsesPlugin ${ASTRO} )
+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-11 16:02:31.392935019 +0200
++++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 16:20:45.561732650 +0200
+@@ -33,4 +33,4 @@
+  ${satellites_SRCS}
+  ${sgp4_SRCS} )
+ 
+-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-11 16:02:31.396935110 +0200
++++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 16:21:24.314610924 +0200
+@@ -16,4 +16,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/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
+--- marble/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:02:31.420935653 +0200
++++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:30:57.359598099 +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()

From 8a70df11a566e7ff70627bfd3734a803bb5548c39b08b13cdd2db5d9f9035550 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 14:36:54 +0000
Subject: [PATCH 3/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=60

---
 marble.spec | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/marble.spec b/marble.spec
index 2ead64f..d41f28c 100644
--- a/marble.spec
+++ b/marble.spec
@@ -27,6 +27,8 @@ 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
 BuildRequires:  gpsd-devel
 BuildRequires:  perl
@@ -61,7 +63,7 @@ BuildRequires:  krunner-devel
 BuildRequires:  libquazip-qt5-devel
 Requires:       libmarblewidget-qt5%{_so} = %{version}
 Requires:       %{name}-data = %{version}
-Requires:       libastro1 = %{version}
+Requires:       libastro-qt5-1 = %{version}
 Requires:       marble-frontend = %{version}
 Recommends:     %{name}-doc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -103,7 +105,7 @@ Marble is a viewer of map data. This package contains its data.
 Summary:        Generic map viewer: Build Environment
 Group:          Development/Libraries/KDE
 Requires:       libmarblewidget-qt5%{_so} = %{version}
-Requires:       libastro1 = %{version}
+Requires:       libastro-qt5-1 = %{version}
 
 %description devel
 Development headers and libraries for Marble.
@@ -124,16 +126,17 @@ Group:          Development/Libraries/KDE
 %description -n libmarblewidget-qt5%{_so}
 The shared library for the MarbleWidget shared library.
 
-%package -n libastro1
+%package -n libastro-qt5-1
 Summary:        Astronomy: Shared Library
 Group:          Development/Libraries/KDE
 
-%description -n libastro1
+%description -n libastro-qt5-1
 The Astronomy shared library for the MarbleWidget shared library.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %ifarch ppc ppc64
@@ -173,9 +176,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 
 %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
 
-%post   -n libastro1 -p /sbin/ldconfig
+%post   -n libastro-qt5-1 -p /sbin/ldconfig
 
-%postun -n libastro1 -p /sbin/ldconfig
+%postun -n libastro-qt5-1 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -206,7 +209,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %{_includedir}/marble/
 %{_includedir}/astro/
 %{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_libdir}/libastro.so
+%{_kf5_libdir}/libastro-qt5.so
 %{_kf5_sharedir}/marble/cmake/
 
 %files data
@@ -221,9 +224,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %defattr(-,root,root)
 %{_kf5_libdir}/libmarblewidget-qt5.so.*
 
-%files -n libastro1
+%files -n libastro-qt5-1
 %defattr(-,root,root)
-%{_kf5_libdir}/libastro.so.*
+%{_kf5_libdir}/libastro-qt5.so.*
 
 %files qt
 %defattr(-,root,root)

From 94ac261a29097faeb7b25f861bd99132c798de0f2394196557c03af4f9578600 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 14:37:14 +0000
Subject: [PATCH 4/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=61

---
 marble.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marble.changes b/marble.changes
index 5dc7686..89349eb 100644
--- a/marble.changes
+++ b/marble.changes
@@ -4,7 +4,7 @@ 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
-
+- Add patch make_astro_coinstall.diff to make libastro coinstallable 
 
 -------------------------------------------------------------------
 Fri Oct  9 13:39:41 UTC 2015 - alarrosa@suse.com

From 98428f57cab90b6801d2998a3ef06e6c472868812a5d275b29ca6face1d7a37f Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 14:40:48 +0000
Subject: [PATCH 5/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=62

---
 libmarblewidget.spec | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/libmarblewidget.spec b/libmarblewidget.spec
index 010d017..ce10b3b 100644
--- a/libmarblewidget.spec
+++ b/libmarblewidget.spec
@@ -39,6 +39,7 @@ The shared library for the MarbleWidget shared library.
 Summary:        Generic map viewer: Build Environment
 Group:          Development/Libraries/KDE
 Requires:       libmarblewidget%{_so} = %{version}
+Requires:       libastro1 = %{version}
 Conflicts:      marble-devel
 
 %description devel
@@ -51,6 +52,13 @@ 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}
 
@@ -59,13 +67,20 @@ The shared library for the MarbleWidget shared library.
 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
 %cmake_kde4 -d build -- -DQT5BUILD=OFF
-cd src/lib/marble
-make 
+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}
@@ -74,11 +89,17 @@ make
 
 %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/
 %{_libdir}/libmarblewidget.so
+%{_libdir}/libastro.so
 %{_kde4_appsdir}/cmake/modules/FindMarble.cmake
 
 %files -n libmarblewidget%{_so} 
@@ -86,4 +107,10 @@ make
 %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

From ee7598a38e91672236aeb8a6f20166f05147ef93abbb5d92b6e177cc94cfada1 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 14:41:26 +0000
Subject: [PATCH 6/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=63

---
 libmarblewidget.changes | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libmarblewidget.changes b/libmarblewidget.changes
index d2f9c07..02daa31 100644
--- a/libmarblewidget.changes
+++ b/libmarblewidget.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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
 

From 218eca4546c9ce568599905044a4c44ac5b3f2845f1880a91e549b30be92d821 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 15:11:50 +0000
Subject: [PATCH 7/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=64

---
 libmarblewidget.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmarblewidget.spec b/libmarblewidget.spec
index ce10b3b..c3c0571 100644
--- a/libmarblewidget.spec
+++ b/libmarblewidget.spec
@@ -18,7 +18,7 @@
 %define _so 22
 
 Name:           libmarblewidget
-Version:        15.08.1
+Version:        15.08.2
 Release:        0
 Summary:        Generic map viewer library for libkgeomapr
 License:        LGPL-2.1+

From 21207919a174fc6033903bd4484724ac7dc968059edfe637a5a9c4f415d7f810 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Sun, 11 Oct 2015 16:10:28 +0000
Subject: [PATCH 8/8] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=65

---
 libmarblewidget.spec      |   1 +
 make_astro_coinstall.diff | 142 ++++++++++++++++----------------------
 2 files changed, 59 insertions(+), 84 deletions(-)

diff --git a/libmarblewidget.spec b/libmarblewidget.spec
index c3c0571..fe4dc81 100644
--- a/libmarblewidget.spec
+++ b/libmarblewidget.spec
@@ -98,6 +98,7 @@ make
 %defattr(-,root,root)
 %doc BUGS CODING
 %{_includedir}/marble/
+%{_includedir}/astro/
 %{_libdir}/libmarblewidget.so
 %{_libdir}/libastro.so
 %{_kde4_appsdir}/cmake/modules/FindMarble.cmake
diff --git a/make_astro_coinstall.diff b/make_astro_coinstall.diff
index 4afb67c..907f55f 100644
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@@ -1,7 +1,7 @@
-diff -urB marble/CMakeLists.txt new/CMakeLists.txt
---- marble/CMakeLists.txt	2015-10-11 16:02:31.052927316 +0200
-+++ new/CMakeLists.txt	2015-10-11 16:14:01.424573511 +0200
-@@ -100,6 +100,7 @@
+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)
@@ -9,7 +9,7 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt
  
    include_directories( ${Qt5Svg_INCLUDE_DIRS} )
    include_directories( ${Qt5PrintSupport_INCLUDE_DIRS} )
-@@ -114,6 +115,7 @@
+@@ -135,6 +136,7 @@
    set(WITH_KF5 FALSE)
    set(QT4BUILD TRUE)
    set(MARBLEWIDGET marblewidget)
@@ -17,30 +17,9 @@ diff -urB marble/CMakeLists.txt new/CMakeLists.txt
    find_package(Qt4 REQUIRED)
    set( QT_USE_QTXML         ON )
    set( QT_USE_QTNETWORK     ON )
-diff -urB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
---- marble/src/apps/behaim/CMakeLists.txt	2015-10-11 16:02:31.312933206 +0200
-+++ new/src/apps/behaim/CMakeLists.txt	2015-10-11 16:26:33.617620798 +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-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-kde/CMakeLists.txt	2015-10-11 16:26:09.313069972 +0200
+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
 @@ -54,7 +54,7 @@
      marble
      marbleui
@@ -50,30 +29,30 @@ diff -urB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMak
      KF5::NewStuff
      KF5::Wallet
      KF5::Parts
-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-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-maps/CMakeLists.txt	2015-10-11 16:25:56.024768817 +0200
-@@ -29,7 +29,7 @@
-       ${Qt5Positioning_LIBRARIES}
-       ${Qt5AndroidExtras_LIBRARIES}
-       ${Qt5Multimedia_LIBRARIES}
--      astro
-+      ${ASTRO}
+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}
        ${MARBLEWIDGET}
-       marbledeclarative)
+-      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"
+ )
  
-@@ -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-11 16:02:31.312933206 +0200
-+++ new/src/apps/marble-qt/CMakeLists.txt	2015-10-11 16:26:59.470206705 +0200
+ # 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
@@ -92,10 +71,10 @@ diff -urB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeL
  endif()
  
  if(WIN32)
-diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
---- marble/src/lib/astro/CMakeLists.txt	2015-10-11 16:02:31.324933478 +0200
-+++ new/src/lib/astro/CMakeLists.txt	2015-10-11 16:18:09.918205232 +0200
-@@ -22,27 +22,27 @@
+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 @@
    solarsystem.cpp
  )
  
@@ -121,15 +100,10 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
  
 -SET_TARGET_PROPERTIES(astro PROPERTIES
 +SET_TARGET_PROPERTIES(${ASTRO} PROPERTIES
-     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}
-   )
-@@ -50,11 +50,11 @@
+   VERSION ${GENERIC_LIB_VERSION}
+   SOVERSION ${GENERIC_LIB_SOVERSION}
+   DEFINE_SYMBOL MAKE_ASTRO_LIB            # needed for astrolib_export.h
+@@ -44,11 +44,11 @@
  
  # choose the correct target install library path
  if(WIN32)
@@ -144,9 +118,9 @@ diff -urB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
  endif()
  
  ########### install files ###############
-diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
---- marble/src/lib/marble/CMakeLists.txt	2015-10-11 16:02:31.328933569 +0200
-+++ new/src/lib/marble/CMakeLists.txt	2015-10-11 16:13:31.491895133 +0200
+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 @@
  ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
  
@@ -154,38 +128,38 @@ diff -urB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
 -TARGET_LINK_LIBRARIES (${MARBLEWIDGET} astro)
 +TARGET_LINK_LIBRARIES (${MARBLEWIDGET} ${ASTRO})
  
- # 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-11 16:02:31.388934928 +0200
-+++ new/src/plugins/render/eclipses/CMakeLists.txt	2015-10-11 16:21:07.418228001 +0200
+ # 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 @@
  
  marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
  
 -target_link_libraries( EclipsesPlugin astro )
 +target_link_libraries( EclipsesPlugin ${ASTRO} )
-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-11 16:02:31.392935019 +0200
-+++ new/src/plugins/render/satellites/CMakeLists.txt	2015-10-11 16:20:45.561732650 +0200
-@@ -33,4 +33,4 @@
+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 @@
   ${satellites_SRCS}
   ${sgp4_SRCS} )
  
--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-11 16:02:31.396935110 +0200
-+++ new/src/plugins/render/stars/CMakeLists.txt	2015-10-11 16:21:24.314610924 +0200
+-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 @@
  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/tools/osm-sisyphus/CMakeLists.txt new/tools/osm-sisyphus/CMakeLists.txt
---- marble/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:02:31.420935653 +0200
-+++ new/tools/osm-sisyphus/CMakeLists.txt	2015-10-11 16:30:57.359598099 +0200
+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} )