[marble] import
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 15 13:44:07 UTC 2011
commit 7a5ef4a5c3e4376e6f75cec0aaa371a3f281fce8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Sep 15 08:50:15 2011 -0500
import
.gitignore | 1 +
marble-4.7.0-gpsd3.patch | 42 ++++++++++++++
marble.spec | 139 ++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 183 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a52950d..d462be9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
marble-0.4-3.tar.bz2
+/marble-4.7.0.tar.bz2
diff --git a/marble-4.7.0-gpsd3.patch b/marble-4.7.0-gpsd3.patch
new file mode 100644
index 0000000..e11859b
--- /dev/null
+++ b/marble-4.7.0-gpsd3.patch
@@ -0,0 +1,42 @@
+diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500
++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
+
+ GpsdConnection::GpsdConnection( QObject* parent )
+ : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++ m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+ m_timer( 0 )
+ {
+ m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection()
+ void GpsdConnection::initialize()
+ {
+ m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++ gps_data_t* data;
++#else
+ gps_data_t* data = m_gpsd.open();
++#endif
+ if ( data ) {
+ m_status = PositionProviderStatusAcquiring;
+ emit statusChanged( m_status );
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++ if ( m_gpsd.waiting(0) ) {
++#else
+ if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++ gps_data_t* data = m_gpsd.read();
++#else
+ gps_data_t* data = m_gpsd.poll();
++#endif
+ if ( data && data->set & PACKET_SET ) {
+ emit gpsdInfo( *data );
+ }
diff --git a/marble.spec b/marble.spec
new file mode 100644
index 0000000..a7e51a7
--- /dev/null
+++ b/marble.spec
@@ -0,0 +1,139 @@
+
+Name: marble
+Summary: Virtual globe and world atlas
+Epoch: 1
+Version: 4.7.0
+Release: 11%{?dist}
+
+License: LGPLv2+
+#URL: https://projects.kde.org/projects/kde/kdeedu/marble
+URL: http://edu.kde.org/marble/
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
+## upstream patches
+# fix build against gpsd-2.96+
+#https://bugs.kde.org/269165
+Patch100: marble-4.7.0-gpsd3.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: gpsd-devel
+BuildRequires: qt-mobility-devel
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+
+# when split occurred
+Obsoletes: kdeedu-marble < 4.7.0-10
+Provides: kdeedu-marble = %{version}-%{release}
+
+%description
+Marble is a Virtual Globe and World Atlas that you can use to learn more
+about Earth: You can pan and zoom around and you can look up places and
+roads. A mouse click on a place label will provide the respective Wikipedia
+article.
+
+Of course it's also possible to measure distances between locations or watch
+the current cloud cover. Marble offers different thematic maps: A classroom-
+style topographic map, a satellite view, street map, earth at night and
+temperature and precipitation maps. All maps include a custom map key, so it
+can also be used as an educational tool for use in class-rooms. For
+educational purposes you can also change date and time and watch how the
+starry sky and the twilight zone on the map change.
+
+In opposite to other virtual globes Marble also features multiple
+projections: Choose between a Flat Map ("Plate carré"), Mercator or the Globe.
+
+%package libs
+Summary: Runtime files for %{name}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: kdeedu-marble-libs < 4.7.0-10
+Provides: kdeedu-marble-libs = %{version}-%{release}
+%description libs
+%{summary}.
+
+%package devel
+Summary: Development files for %{name}
+# when split occurred
+Conflicts: kdeedu-devel < 4.7.0-10
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: kdelibs4-devel
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q
+
+%patch100 -p1 -b .gpsd3
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde --without-mo
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/marble.desktop
+
+
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%files -f %{name}.lang
+%doc LICENSE.txt
+%doc CREDITS MANIFESTO.txt TODO USECASES
+%{_kde4_appsdir}/marble/
+%{_kde4_bindir}/marble
+%{_kde4_bindir}/geodatatest
+%{_kde4_bindir}/routing-instructions
+%{_kde4_bindir}/tilecreator
+%{_kde4_datadir}/applications/kde4/marble.desktop
+%{_kde4_datadir}/config.kcfg/marble.kcfg
+%{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_iconsdir}/hicolor/*/*/marble.*
+# worldclock links against libmarblewidget, include here
+%{_kde4_libdir}/kde4/plasma_applet_worldclock.so
+%{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs
+%{_kde4_libdir}/libmarblewidget.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
+
+%files devel
+%doc docs/*
+%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
+%{_includedir}/marble/
+%{_kde4_libdir}/libmarblewidget.so
+
+
+%changelog
+* Wed Sep 14 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.0-11
+- update URL
+
+* Tue Aug 30 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.0-10
+- first try
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..c6db03c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+d9dc301b31b6f18531e65a2b6bbec520 marble-4.7.0.tar.bz2
More information about the scm-commits
mailing list