diff --git a/do_not_build_qtonly_and_mobile.diff b/do_not_build_qtonly_and_mobile.diff new file mode 100644 index 0000000..d65473d --- /dev/null +++ b/do_not_build_qtonly_and_mobile.diff @@ -0,0 +1,11 @@ +Index: src/apps/CMakeLists.txt +=================================================================== +--- src/apps/CMakeLists.txt.orig 2014-03-31 09:51:15.000000000 +0200 ++++ src/apps/CMakeLists.txt 2014-04-25 22:22:29.253322142 +0200 +@@ -1,6 +1,4 @@ + add_subdirectory(marble-ui) +-add_subdirectory(marble-qt) +-add_subdirectory(marble-mobile) + + if (NOT QTONLY) + add_subdirectory(marble-kde) diff --git a/marble.changes b/marble.changes index 19935f8..68d56ce 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 23 20:51:12 UTC 2014 - ctrippe@opensuse.org + +- remove additional desktop files as they cause multiple non + distinguishable entries in the menu (kde#327405) + Do not build qt only version and mobile version (added patch + do_not_build_qtonly_and_mobile.diff) + ------------------------------------------------------------------- Fri Apr 11 16:51:20 UTC 2014 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index fbd11a2..4b069e3 100644 --- a/marble.spec +++ b/marble.spec @@ -26,6 +26,8 @@ License: LGPL-2.1+ Group: Amusements/Teaching/Other Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE do_not_build_qtonly_and_mobile.diff do not build qt-only version and mobile version +Patch0: do_not_build_qtonly_and_mobile.diff BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: libkde4-devel @@ -90,6 +92,7 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q +%patch0 %build %ifarch ppc ppc64 @@ -103,6 +106,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %kde_post_install %fdupes -s %{buildroot} +#remove additional desktop files as they cause multiple non distinguishable entries in the homerun (https://bugs.kde.org/show_bug.cgi?id=327405#c8) or even a single random entry in kickoff + rm -rf %{buildroot}/usr/share/applications/kde4/marble-touch.desktop + %post -n libmarblewidget%{_so} -p /sbin/ldconfig %postun -n libmarblewidget%{_so} -p /sbin/ldconfig @@ -123,9 +129,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kde4_applicationsdir}/marble_kml.desktop %{_kde4_applicationsdir}/marble_osm.desktop %{_kde4_applicationsdir}/marble_kmz.desktop -%{_kde4_applicationsdir}/marble-mobile.desktop -%{_kde4_applicationsdir}/marble-qt.desktop -%{_kde4_applicationsdir}/marble-touch.desktop %{_kde4_applicationsdir}/marble_geo.desktop %{_kde4_applicationsdir}/marble_worldwind.desktop %{_kde4_appsdir}/marble/