I have made the following changes intended for : CE:Apps / marble Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/8114 Thank You, wonko [This message was auto-generated] --- Request # 8114: Messages from BOSS: State: review at 2013-02-18T22:52:28 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:wonko:CE:Apps / marble -> CE:Apps / marble changes files: -------------- ++++++ new changes file: --- marble.changes +++ marble.changes @@ -0,0 +1,140 @@ +* Mon Feb 18 2013 Ruediger Gad <[email protected]> - 4.10.0+git20130216.084632 +- Use QTONLY version. +- Remove gpsd dependency. +- Remove KDE dependencies. + +* Sat Feb 16 2013 Maurice de la Ferté <[email protected]> - 4.10.0+git20130216.084632 +- Add recommended script call to change marble-touch source for plasma active +- Add libqtdeclarative4-folderlistmodel to requires +- Add QtDeclarative to buildrequires + +* Sat Feb 16 2013 Stephan Binner <[email protected]> - 4.10.0+git20130216.084632 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 7019cb7e05c9b0015025fd1a11322d665a3e0306 + +* Wed Jan 30 2013 Stephan Binner <[email protected]> - 4.10.0+git20130130.195634 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: f731ab8562f1dd895d2d82f83d4ba6dab3cba755 + +* Wed Jan 30 2013 Stephan Binner <[email protected]> - 4.10.0+git20130130.092017 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 8ec4b0569d75f8b636e969156da6ea682b68c7a0 + +* Wed Jan 23 2013 Stephan Binner <[email protected]> - 4.9.4+git20130123.183132 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 8ec4b0569d75f8b636e969156da6ea682b68c7a0 + +* Thu Jan 17 2013 Stephan Binner <[email protected]> - 4.9.4+git20130117.003127 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 908b4673cc67859e6694b537957f8a996ef2b0ea + +* Thu Jan 17 2013 Stephan Binner <[email protected]> - 4.9.4+git20130116.233626 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 60ee559029b9bde72f329448c158d0dba2c48e8e + +* Thu Jan 17 2013 Stephan Binner <[email protected]> - 4.9.4+git20130116.232718 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 73e503f75fb41fe28a89a9564207e1270cae8494 + +* Wed Jan 16 2013 Stephan Binner <[email protected]> - 4.9.4+git20130116.112151 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 42ce85d634ed28407f34312ad839fe309249dcb7 + +* Tue Jan 15 2013 Stephan Binner <[email protected]> - 4.9.4+git20130115.181630 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 14e079270850a108767e710432eb96c1a0c197a9 + +* Sun Jan 13 2013 Stephan Binner <[email protected]> - 4.9.4+git20130113.110210 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 57b6faed8c02e0b56562a684a1f07bae69dd9801 + +* Sat Jan 12 2013 Stephan Binner <[email protected]> - 4.9.4+git20130112.111130 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 8fc40ea4f5b7d86eae086646087c13e863b2dce4 + +* Tue Jan 08 2013 Stephan Binner <[email protected]> - 4.9.4+git20130108.225130 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: f6de2d4b8c70b2c0931b044192bfb7f46588793a + +* Mon Dec 24 2012 Stephan Binner <[email protected]> - 4.9.4+git20121224.074212 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 686faef37eff4a87eba2defd03ea4cb7bbc27036 + +* Sun Dec 23 2012 Stephan Binner <[email protected]> - 4.9.4+git20121223.063726 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 7ba839b4985f3920cd165d93fd66fd1395c78302 + +* Sat Dec 22 2012 Stephan Binner <[email protected]> - 4.9.4+git20121222.092626 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: b7026173f467b3ae7e56323bd21201ae69787939 + +* Sat Dec 22 2012 Stephan Binner <[email protected]> - 4.9.2+git20121222.065324 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 343d00b8185578bb4eda91ea857f4d87119c4ac6 + +* Fri Dec 21 2012 Stephan Binner <[email protected]> - 4.9.2+git20121221.082755 +- Update automatically tarball from repository. +- Repository URL: git://anongit.kde.org/marble +- Branch: KDE/4.10 +- Commit ID: 769be0f3bc3e65334ba29b05b6c077a4c9ad421c + +* Sat Nov 03 2012 Maurice de la Fert <[email protected]> - 4.9.2 +- Update to 4.9.2 upstream version and remove unneeded workaround + +* Wed Apr 18 2012 lamarque <[email protected]> - 4.8.2 +- Readd the workaround for simplifying qml components development. + +* Mon Apr 09 2012 Maurice de la Fert <[email protected]> - 4.8.2 +- Update to 4.8.2 + +* Mon Jan 30 2012 Maurice de la Fert <[email protected]> - 4.8.0 +- Add work-a-round in packaging to simplify qml components development + +* Mon Jan 30 2012 Maurice de la Fert <[email protected]> - 4.8.0 +- Enable build of gps file reader plugin and add dependencies + Thanks to Lamarque Souza <[email protected]> + +* Thu Jan 26 2012 Maurice de la Fert <[email protected]> - 4.8.0 +- Update to 4.8.0 +- Remove unneeded patch + +* Thu Dec 08 2011 Javier Llorente <[email protected]> - 4.7.4 +- Update to 4.7.4 + +* Thu Oct 06 2011 Maurice de la Ferté <[email protected]> - 4.7.2 +- Update to 4.7.2 release + +* Thu Sep 15 2011 Stephan Binner <[email protected]> - 4.7.1 +- Updated to 4.7.1 release new: ---- marble-4.10.0+git20130216.084632.tar.bz2 marble-touch.sh marble.changes marble.spec marble.yaml patch_desktop_file_to_start_marble-touch.patch spec files: ----------- ++++++ new spec file: --- marble.spec +++ marble.spec @@ -0,0 +1,129 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 +# + +Name: marble + +# >> macros +# << macros + +Summary: Virtual Globe +Version: 4.10.0+git20130216.084632 +Release: 1 +Group: Applications/Engineering +License: LGPLv2+ +URL: http://kde.org/applications/education/marble/ +Source0: %{name}-%{version}.tar.bz2 +Source1: marble-touch.sh +Source100: marble.yaml +Patch0: patch_desktop_file_to_start_marble-touch.patch +Requires: libqtdeclarative4-folderlistmodel +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(QtWebKit) +BuildRequires: pkgconfig(QtLocation) +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: fdupes +BuildRequires: cmake + +%description +Find your way and explore the world with Marble. +Marble is a virtual globe with advanced routing capabilities. Use it as your +personal navigation device to guide you to any destination in the world. +Download maps from a variety of themes and explore the surroundings. +Record your trip and share it with your friends. +Main features: +- Online and offline routing +- GPS tracking and recording (KML format) +- Themable maps (OpenStreetMap, Satellite Map, many more) +- Support for different projections (globe, flat map, ...) and other planets +- Download of maps and route data for offline usage + + +%package devel +Summary: Virtual Globe Development Files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains headers and libraries required to build applications that +use marble. + + + +%prep +%setup -q -n %{name}-%{version} + +# patch_desktop_file_to_start_marble-touch.patch +%patch0 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%cmake . \ + -DMOBILE=ON \ + -DQTONLY=ON \ + -DBUILD_WITH_DBUS=ON \ + -DBUILD_GPS_FILEREADER_PLUGIN=OFF + +make %{?jobs:-j%jobs} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install +mkdir -p %{buildroot}"%{_bindir}" +cp -a %{SOURCE1} %{buildroot}"%{_bindir}" + + +# >> install post +chmod 755 %{buildroot}%{_bindir}/marble-touch.sh +rm %{buildroot}%{_datadir}/applications/marble_*.desktop +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop +%fdupes %{buildroot}/%{_datadir} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +# >> files +%doc CREDITS LICENSE.txt docs/marble-intro.pdf +%{_bindir}/marble +%{_bindir}/marble-touch +%{_bindir}/marble-touch.sh +%{_bindir}/tilecreator +%{_bindir}/routing-instructions +%{_libdir}/*.so.* +%dir %{_libdir}/marble/* +%{_libdir}/marble +%{_datadir}/applications/*.desktop +%dir %{_datadir}/marble +%{_datadir}/marble/* +%{_datadir}/icons/hicolor/*/apps/marble.png +# << files + +%files devel +%defattr(-,root,root,-) +# >> files devel +%doc docs/Programmers-manual.txt +%{_includedir}/marble/* +%{_libdir}/libmarblewidget.so +# << files devel other changes: -------------- ++++++ marble-4.10.0+git20130216.084632.tar.bz2 (new) ++++++ marble-touch.sh (new) --- marble-touch.sh +++ marble-touch.sh @@ -0,0 +1,3 @@ +#!/bin/sh +QML_IMPORT_PATH=$QML_IMPORT_PATH:/usr/lib/marble/plugins marble-touch + ++++++ marble.yaml (new) --- marble.yaml +++ marble.yaml @@ -0,0 +1,55 @@ +Name: marble +Summary: Virtual Globe +Version: 4.10.0+git20130216.084632 +Release: 1 +Group: Applications/Engineering +License: LGPLv2+ +URL: http://kde.org/applications/education/marble/ +Sources: + - "%{name}-%{version}.tar.bz2" +ExtraSources: + - marble-touch.sh;"%{_bindir}" +Patches: + - patch_desktop_file_to_start_marble-touch.patch +Description: | + Find your way and explore the world with Marble. + Marble is a virtual globe with advanced routing capabilities. Use it as your + personal navigation device to guide you to any destination in the world. + Download maps from a variety of themes and explore the surroundings. + Record your trip and share it with your friends. + Main features: + - Online and offline routing + - GPS tracking and recording (KML format) + - Themable maps (OpenStreetMap, Satellite Map, many more) + - Support for different projections (globe, flat map, ...) and other planets + - Download of maps and route data for offline usage +PkgConfigBR: + - x11 + - QtWebKit + - QtLocation + - QtCore + - QtDeclarative +PkgBR: + - cmake +RequiresPost: + - /sbin/ldconfig +RequiresPostUn: + - /sbin/ldconfig +Requires: + - libqtdeclarative4-folderlistmodel +ConfigOptions: + - -DMOBILE=ON + - -DQTONLY=ON + - -DBUILD_WITH_DBUS=ON + - -DBUILD_GPS_FILEREADER_PLUGIN=OFF +Builder: cmake +RunFdupes: + - "%{_datadir}" +SubPackages: + - Name: devel + Summary: Virtual Globe Development Files + Group: Development/Libraries + Description: | + This package contains headers and libraries required to build applications that + use marble. + ++++++ patch_desktop_file_to_start_marble-touch.patch (new) --- patch_desktop_file_to_start_marble-touch.patch +++ patch_desktop_file_to_start_marble-touch.patch @@ -0,0 +1,23 @@ +diff --git a/src/marble.desktop b/src/marble.desktop +index 7e5fc16..70f4d45 100644 +--- a/src/marble.desktop ++++ b/src/marble.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Type=Application +-TryExec=marble +-Exec=marble ++TryExec=marble-touch.sh ++Exec=marble-touch.sh + Name=Marble + Name[ast]=Marble + Name[bg]=Marble +@@ -113,7 +113,7 @@ GenericName[uk]=Настільний глобус + GenericName[x-test]=xxDesktop Globexx + GenericName[zh_CN]=桌面地球仪 + GenericName[zh_TW]=桌面星象儀 +-Icon=marble ++Icon=/usr/share/icons/hicolor/64x64/apps/marble.png + Terminal=false + Categories=Qt;KDE;Education;Geography; + X-DocPath=marble/index.html
