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

Accepting request 231502 from KDE:Distro:Factory

Browse Source 
- 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)

corresponding lines to the desktop files are now removed and the qt-only version and mobile version are no longer build, as shumski suggested. The 
touch version is still build but no desktop file installed. (forwarded request 231501 from christiantrippe)

OBS-URL: https://build.opensuse.org/request/show/231502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=51
This commit is contained in:
Stephan Kulow 2014-05-02 13:11:06 +00:00 committed by Git OBS Bridge
parent 9ea5cf4804
commit 23272a8151
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
do_not_build_qtonly_and_mobile.diff Normal file
View File

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

8
marble.changes
View File

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

9
marble.spec
View File

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