rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 338725 from KDE:Applications

Browse Source 
Update to KDE Applications 15.08.2

OBS-URL: https://build.opensuse.org/request/show/338725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2015-10-19 20:43:52 +00:00 committed by Git OBS Bridge
commit b6a99cc9ab
7 changed files with 236 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmarblewidget.changes
View File

@ -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

34
libmarblewidget.spec
View File

@ -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+
@ -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,18 @@ 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/
%{_includedir}/astro/
%{_libdir}/libmarblewidget.so
%{_libdir}/libastro.so
%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
%files -n libmarblewidget%{_so}
@ -86,4 +108,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

172
make_astro_coinstall.diff Normal file
View File

@ -0,0 +1,172 @@
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)
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
@@ -54,7 +54,7 @@
marble
marbleui
${MARBLEWIDGET}
- astro
+ ${ASTRO}
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}
${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"
)
# 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()
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 @@
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
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)
- 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-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})
# 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 @@
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 @@
${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 @@
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()

3
marble-15.08.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037
size 23273312

3
marble-15.08.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3c4630fbf598caf54ee7c04500e9476462bc5c53105ffcb170d71c8f7361b02
size 23272016

8
marble.changes
View File

@ -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
- Add patch make_astro_coinstall.diff to make libastro coinstallable
-------------------------------------------------------------------
Fri Oct 9 13:39:41 UTC 2015 - alarrosa@suse.com

23
marble.spec
View File

@ -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+
@ -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)