From fa2a7d78a22c3ade8835fd6e8938063095d85934e4b6c70d1f278a38cbf6a3b4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 7 Aug 2015 11:27:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=20 --- marble.spec | 108 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 93 insertions(+), 15 deletions(-) diff --git a/marble.spec b/marble.spec index 6ae5784..64b5be0 100644 --- a/marble.spec +++ b/marble.spec @@ -15,8 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define with_qt5 0 +%if 0{?with_qt5} +%define _so -qt522 +%else %define _so 22 +%endif Name: marble Version: 15.07.90 @@ -28,6 +33,7 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpsd-devel +%if 0{?with_qt5} BuildRequires: kconfig-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0 @@ -58,9 +64,14 @@ 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-qt5%{_so} = %{version} +Requires: libmarblewidget%{_so} = %{version} Requires: marble-frontend = %{version} Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -84,7 +95,11 @@ Group: Amusements/Teaching/Other Requires: %{name} = %{version} Provides: marble-frontend = %{version} Conflicts: otherproviders(marble-frontend) +%if 0{?with_qt5} Supplements: packageand(marble:plasma5-desktop) +%else +Supplements: packageand(marble:kdebase4-workspace) +%endif %description kde The KDE frontend for the Marble map viewer @@ -101,7 +116,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-qt5%{_so} = %{version} +Requires: libmarblewidget%{_so} = %{version} %description devel Development headers and libraries for Marble. @@ -115,11 +130,11 @@ BuildArch: noarch %description doc Marble is a viewer of map data. This package contains its documentation. -%package -n libmarblewidget-qt5%{_so} +%package -n libmarblewidget%{_so} Summary: Generic map viewer: Shared Library Group: Development/Libraries/KDE -%description -n libmarblewidget-qt5%{_so} +%description -n libmarblewidget%{_so} The shared library for the MarbleWidget shared library. %package -n libastro2 @@ -133,6 +148,11 @@ The Astronomy shared library for the MarbleWidget shared library. %setup -q %build +%ifarch ppc ppc64 +export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif + +%if 0{?with_qt5} export SUSE_ASNEEDED=0 %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" @@ -156,36 +176,49 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %endif -DWITH_KF5=TRUE \ .. +%else + %cmake_kde4 -d build +%endif + %make_jobs %install +%if 0{?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 - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop - rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop -%post -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig +%post -n libmarblewidget%{_so} -p /sbin/ldconfig -%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig +%postun -n libmarblewidget%{_so} -p /sbin/ldconfig %post -n libastro2 -p /sbin/ldconfig -%postun -n libastro2 -p /sbin/ldconfig +n libastro2 -p /sbin/ldconfig %files %defattr(-,root,root) %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt %{_datadir}/marble/ %{_datadir}/appdata/ -%{_kf5_iconsdir}/hicolor/*/apps/marble.* %{_libdir}/marble/ %{_libdir}/libmarbledeclarative.so %dir %{_libdir}/plugins/ %{_libdir}/plugins/designer/ %exclude %{_datadir}/marble/data +%if 0{?with_qt5} +%{_kf5_iconsdir}/hicolor/*/apps/marble.* %_kf5_plugindir/libmarble*so %_kf5_plugindir/libplasma_runner_marble.so %_kf5_servicesdir/*desktop @@ -197,15 +230,44 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %_kf5_applicationsdir/marble_kmz.desktop %_kf5_applicationsdir/marble_osm.desktop %_kf5_applicationsdir/marble_worldwind.desktop -%_kf5_bindir/marble-maps +%else +%{_kde4_applicationsdir}/marble.desktop +%{_kde4_applicationsdir}/marble_gpx.desktop +%{_kde4_applicationsdir}/marble_kml.desktop +%{_kde4_applicationsdir}/marble_osm.desktop +%{_kde4_applicationsdir}/marble_kmz.desktop +%{_kde4_applicationsdir}/marble_geo.desktop +%{_kde4_applicationsdir}/marble_worldwind.desktop +%{_kde4_configkcfgdir}/marble.kcfg +%{_kde4_datadir}/appdata/marble.appdata.xml +%{_kde4_datadir}/mime/packages/geo.xml +%{_kde4_iconsdir}/hicolor/*/apps/marble.* +%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/ +%{_kde4_modulesdir}/libmarble_part.so +%{_kde4_modulesdir}/marblethumbnail.so +%{_kde4_modulesdir}/plasma_applet_worldclock.so +%{_kde4_modulesdir}/plasma_runner_marble.so +%{_kde4_modulesdir}/plugins/designer/* +%{_kde4_modulesdir}/plugins/marble/ +%{_kde4_servicesdir}/*.desktop +%{_kde4_appsdir}/marble/ +%endif +%_bindir/marble-maps %files devel %defattr(-,root,root) %doc BUGS CODING %{_includedir}/marble/ %{_includedir}/astro/ +%if 0{?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 %defattr(-,root,root) @@ -213,11 +275,19 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files doc %defattr(-,root,root) -%_kf5_htmldir/en/marble/ +%if 0{?with_qt5} +%{_kf5_htmldir}/en/marble/ +%else +%{_kde4_htmldir}/en/marble/ +%endif -%files -n libmarblewidget-qt5%{_so} +%files -n libmarblewidget%{_so} %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_libdir}/libmarblewidget-qt5.so.* +%else +%{_kde4_libdir}/libmarblewidget.so.* +%endif %files -n libastro2 %defattr(-,root,root) @@ -225,12 +295,20 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \ %files qt %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_applicationsdir}/marble-qt.desktop -%{_kf5_bindir}/marble-qt +%else +%{_kde4_applicationsdir}/marble-qt.desktop +%endif +%{_bindir}/marble-qt %files kde %defattr(-,root,root) +%if 0{?with_qt5} %{_kf5_applicationsdir}/marble.desktop -%{_kf5_bindir}/marble +%else +%{_kde4_applicationsdir}/marble.desktop +%endif +%{_bindir}/marble %changelog