Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2014-05-02 15:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2014-04-18 12:35:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2014-05-02 15:11:07.000000000 +0200 @@ -1,0 +2,8 @@ +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) + +------------------------------------------------------------------- New: ---- do_not_build_qtonly_and_mobile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.tCOBhp/_old 2014-05-02 15:11:08.000000000 +0200 +++ /var/tmp/diff_new_pack.tCOBhp/_new 2014-05-02 15:11:08.000000000 +0200 @@ -26,6 +26,8 @@ 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 @@ %prep %setup -q +%patch0 %build %ifarch ppc ppc64 @@ -103,6 +106,9 @@ %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 @@ %{_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/ ++++++ do_not_build_qtonly_and_mobile.diff ++++++ 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) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org