OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=100

2016-07-08 09:46:15 +00:00 · 2016-07-08 09:46:15 +00:00 · cc826853ea
commit cc826853ea
parent 67b08a68bb
3 changed files with 11 additions and 178 deletions
--- a/make_astro_coinstall.diff
+++ b/make_astro_coinstall.diff
@ -1,168 +0,0 @@
-diff -urNB marble/CMakeLists.txt new/CMakeLists.txt
--- marble/CMakeLists.txt	2016-04-02 08:57:40.301310654 +0200
-+++ new/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
-@@ -94,6 +94,7 @@
- 
- 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 -urNB marble/src/apps/behaim/CMakeLists.txt new/src/apps/behaim/CMakeLists.txt
--- marble/src/apps/behaim/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
-+++ new/src/apps/behaim/CMakeLists.txt	2016-04-02 08:57:58.365012968 +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 -urNB marble/src/apps/marble-kde/CMakeLists.txt new/src/apps/marble-kde/CMakeLists.txt
--- marble/src/apps/marble-kde/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
-+++ new/src/apps/marble-kde/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
-@@ -53,7 +53,7 @@
-     marble
-     marbleui
-     ${MARBLEWIDGET}
-    astro
-+    ${ASTRO}
-     KF5::NewStuff
-     KF5::Parts
-     KF5::Crash
-diff -urNB marble/src/apps/marble-maps/CMakeLists.txt new/src/apps/marble-maps/CMakeLists.txt
--- marble/src/apps/marble-maps/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
-+++ new/src/apps/marble-maps/CMakeLists.txt	2016-04-02 08:57:58.365012968 +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 -urNB marble/src/apps/marble-qt/CMakeLists.txt new/src/apps/marble-qt/CMakeLists.txt
--- marble/src/apps/marble-qt/CMakeLists.txt	2016-04-02 08:57:40.593305808 +0200
-+++ new/src/apps/marble-qt/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
-@@ -34,7 +34,7 @@
- ${Qt5WebKit_LIBRARIES}
- marbleui
- ${MARBLEWIDGET}
-astro)
-+${ASTRO})
- 
- if(WIN32)
-   target_link_libraries(
-diff -urNB marble/src/lib/astro/CMakeLists.txt new/src/lib/astro/CMakeLists.txt
--- marble/src/lib/astro/CMakeLists.txt	2016-04-02 08:57:40.633305144 +0200
-+++ new/src/lib/astro/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
-@@ -21,27 +21,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}
-   )
-@@ -49,11 +49,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 -urNB marble/src/lib/marble/CMakeLists.txt new/src/lib/marble/CMakeLists.txt
--- marble/src/lib/marble/CMakeLists.txt	2016-04-02 08:57:40.637305078 +0200
-+++ new/src/lib/marble/CMakeLists.txt	2016-04-02 08:57:58.365012968 +0200
-@@ -361,7 +361,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 -urNB marble/src/plugins/render/eclipses/CMakeLists.txt new/src/plugins/render/eclipses/CMakeLists.txt
--- marble/src/plugins/render/eclipses/CMakeLists.txt	2016-04-02 08:57:40.693304148 +0200
-+++ new/src/plugins/render/eclipses/CMakeLists.txt	2016-04-02 08:57:58.369012904 +0200
-@@ -22,4 +22,4 @@
- 
- marble_add_plugin( EclipsesPlugin ${eclipses_SRCS} )
- 
-target_link_libraries( EclipsesPlugin astro )
-+target_link_libraries( EclipsesPlugin ${ASTRO} )
-diff -urNB marble/src/plugins/render/satellites/CMakeLists.txt new/src/plugins/render/satellites/CMakeLists.txt
--- marble/src/plugins/render/satellites/CMakeLists.txt	2016-04-02 08:57:40.701304015 +0200
-+++ new/src/plugins/render/satellites/CMakeLists.txt	2016-04-02 08:57:58.369012904 +0200
-@@ -30,4 +30,4 @@
-  ${satellites_SRCS}
-  ${sgp4_SRCS} )
- 
-target_link_libraries( SatellitesPlugin astro sgp4 )
-+target_link_libraries( SatellitesPlugin ${ASTRO} sgp4 )
-diff -urNB marble/src/plugins/render/stars/CMakeLists.txt new/src/plugins/render/stars/CMakeLists.txt
--- marble/src/plugins/render/stars/CMakeLists.txt	2016-04-02 08:57:40.701304015 +0200
-+++ new/src/plugins/render/stars/CMakeLists.txt	2016-04-02 08:57:58.369012904 +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} )
--- a/marble.changes
+++ b/marble.changes
@ -5,6 +5,8 @@ Fri Jul  8 09:19:55 UTC 2016 - tittiatcoke@gmail.com
   * KDE Applications 16.04.3
   * https://www.kde.org/announcements/announce-applications-16.04.3.php

+- Drop patch make_astro_coinstall.diff. Coinstallability is no 
+  longer required as that Digikam v5 (KF5 based) has been released

 -------------------------------------------------------------------
 Fri Jun 10 18:11:42 UTC 2016 - tittiatcoke@gmail.com
--- a/marble.spec
+++ b/marble.spec
@ -25,8 +25,6 @@ License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
-# 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
@ -125,16 +123,17 @@ Group:          Development/Libraries/KDE
 %description -n libmarblewidget-qt5%{_so}
 The shared library for the MarbleWidget shared library.

-%package -n libastro-qt5-1
+%package -n libastro1
 Summary:        Astronomy: Shared Library
 Group:          Development/Libraries/KDE
+Obsoletes:      libastro-qt5-1 < %{version}
+Provides:       libastro-qt5-1 = %{version}

-%description -n libastro-qt5-1
+%description -n libastro1
 The Astronomy shared library for the MarbleWidget shared library.

 %prep
 %setup -q
-%patch1 -p1

 %build
 %ifarch ppc ppc64
@ -173,9 +172,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \

 %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig

-%post   -n libastro-qt5-1 -p /sbin/ldconfig
+%post   -n libastro1 -p /sbin/ldconfig

-%postun -n libastro-qt5-1 -p /sbin/ldconfig
+%postun -n libastro1 -p /sbin/ldconfig

 %files
 %defattr(-,root,root)
@ -207,7 +206,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %{_includedir}/marble/
 %{_includedir}/astro/
 %{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_libdir}/libastro-qt5.so
+%{_kf5_libdir}/libastro.so
 %{_kf5_sharedir}/marble/cmake/

 %files data
@ -222,9 +221,9 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %defattr(-,root,root)
 %{_kf5_libdir}/libmarblewidget-qt5.so.*

-%files -n libastro-qt5-1
+%files -n libastro1
 %defattr(-,root,root)
-%{_kf5_libdir}/libastro-qt5.so.*
+%{_kf5_libdir}/libastro.so.*

 %files qt
 %defattr(-,root,root)