From 617f8e6435fede87853c31dd91b4df7e9238ae8fad90271223f3f46765b1b51d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 12:52:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=25 --- marble.changes | 2 +- marble.spec | 69 +++++--------------------------------------------- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/marble.changes b/marble.changes index eea041c..3c7cc25 100644 --- a/marble.changes +++ b/marble.changes @@ -4,8 +4,8 @@ Fri Aug 7 07:04:33 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 * https://www.kde.org/announcements/announce-applications-15.07.90.php + * Marble is now Qt5/KF5 based -- Switch to Qt5 build - Drop patch do_not_build_qtonly_and_mobile.diff which is no longer required diff --git a/marble.spec b/marble.spec index 11ace1e..1d08d98 100644 --- a/marble.spec +++ b/marble.spec @@ -15,13 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define with_qt5 0 - -%if %{with_qt5} -%define _so -qt522 -%else %define _so 22 -%endif Name: marble Version: 15.07.90 @@ -33,7 +27,6 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel -%if %{with_qt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -64,14 +57,9 @@ BuildRequires: kservice-devel BuildRequires: krunner-devel BuildRequires: perl BuildRequires: libquazip-qt5-devel -%else -BuildRequires: libkde4-devel -BuildRequires: perl -BuildRequires: quazip-devel -%endif Requires: %{name}-data = %{version} Requires: libastro2 = %{version} -Requires: libmarblewidget%{_so} = %{version} +Requires: libmarblewidget-qt5%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,11 +83,7 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: marble-frontend = %{version} Conflicts: otherproviders(marble-frontend) -%if %{with_qt5} Supplements: packageand(marble:plasma5-desktop) -%else -Supplements: packageand(marble:kdebase4-workspace) -%endif %description kde The KDE frontend for the Marble map viewer @@ -116,7 +100,7 @@ Marble is a viewer of map data. This package contains its data. %package devel Summary: Generic map viewer: Build Environment Group: Development/Libraries/KDE -Requires: libmarblewidget%{_so} = %{version} +Requires: libmarblewidget-qt5%{_so} = %{version} %description devel Development headers and libraries for Marble. @@ -130,11 +114,11 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget%{_so} +%package -n libmarblewidget-qt5%{_so} Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%description -n libmarblewidget%{_so} +%description -n libmarblewidget-qt5%{_so} The shared library for the MarbleWidget shared library. %package -n libastro2 @@ -152,7 +136,6 @@ The Astronomy shared library for the MarbleWidget shared library. export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%if %{with_qt5} export SUSE_ASNEEDED=0 mkdir build cd build @@ -173,32 +156,21 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %endif -DWITH_KF5=TRUE \ .. -%else - %cmake_kde4 -d build -%endif %make_jobs %install -%if %{with_qt5} %kf5_makeinstall -C build %fdupes -s %{buildroot} rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop -%else - %kde4_makeinstall -C build - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-mobile.desktop - rm -rf %{buildroot}%{_kde4_applicationsdir}/marble-touch.desktop - %kde_post_install - %fdupes -s %{buildroot} -%endif rm -rf %{buildroot}/designer rm -rf %{buildroot}%{_bindir}/marble-mobile rm -rf %{buildroot}%{_bindir}/marble-touch -%post -n libmarblewidget%{_so} -p /sbin/ldconfig +%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig -%postun -n libmarblewidget%{_so} -p /sbin/ldconfig +%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig %post -n libastro2 -p /sbin/ldconfig @@ -211,7 +183,6 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %{_datadir}/appdata/ %{_libdir}/marble/ %exclude %{_datadir}/marble/data -%if %{with_qt5} %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %{_kf5_iconsdir}/hicolor/*/apps/marble.* @@ -226,25 +197,14 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %_kf5_applicationsdir/marble_kmz.desktop %_kf5_applicationsdir/marble_osm.desktop %_kf5_applicationsdir/marble_worldwind.desktop -%else -%{_kde4_datadir}/appdata/marble.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/marble.* -%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/ -%endif %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ -%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so %{_kf5_libdir}/libastro.so -%else -%{_kde4_libdir}/libmarblewidget.so -%{_kde4_libdir}/libastro.so -%{_kde4_appsdir}/cmake/modules/FindMarble.cmake -%endif %files data @@ -253,19 +213,11 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files doc %defattr(-,root,root) -%if %{with_qt5} %{_kf5_htmldir}/en/marble/ -%else -%{_kde4_htmldir}/en/marble/ -%endif -%files -n libmarblewidget%{_so} +%files -n libmarblewidget-qt5%{_so} %defattr(-,root,root) -%if %{with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so.* -%else -%{_kde4_libdir}/libmarblewidget.so.* -%endif %files -n libastro2 %defattr(-,root,root) @@ -273,19 +225,12 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) -%if %{with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop -%else -%endif %{_bindir}/marble-qt %files kde %defattr(-,root,root) -%if %{with_qt5} %{_kf5_applicationsdir}/marble.desktop -%else -%{_kde4_applicationsdir}/marble.desktop -%endif %{_bindir}/marble %changelog