From 0f3d090bd1dc9a6b912eb0b1e587602573304b4a Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 17 Feb 2016 20:41:52 +0100
Subject: First attempt at QML hacking.

Main and ServiceControl adapted. Project files
---
 rpm/rockpool.spec | 16 ++++++++++++----
 rpm/rockpool.yaml | 11 +++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'rpm')

diff --git a/rpm/rockpool.spec b/rpm/rockpool.spec
index 5e19eb5..4e4365a 100644
--- a/rpm/rockpool.spec
+++ b/rpm/rockpool.spec
@@ -13,7 +13,7 @@ Name:       rockpool
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Support for Pebble watches in SailfishOS
-Version:    1.0
+Version:    0.1
 Release:    1
 Group:      Qt/Qt
 License:    GPL3
@@ -23,19 +23,24 @@ Source100:  rockpool.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
 Requires:   systemd-user-session-targets
 Requires:   nemo-qml-plugin-dbus-qt5
+Requires:   quazip
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Bluetooth)
 BuildRequires:  pkgconfig(Qt5Contacts)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Location)
+BuildRequires:  pkgconfig(Qt5Organizer)
 BuildRequires:  pkgconfig(mlite5)
 BuildRequires:  pkgconfig(sailfishapp) >= 0.0.10
 BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(zlib)
+BuildRequires:  desktop-file-utils
 
 %description
-Support for Pebble watch to receive events from SailfishOS device via Bluetooth.
+Support for Pebble watch on SailfishOS devices.
 
 
 %prep
@@ -67,6 +72,10 @@ mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
 ln -s ../rockpoold.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
 # << install post
 
+desktop-file-install --delete-original       \
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/*.desktop
+
 %post
 # >> post
 su nemo -c 'systemctl --user daemon-reload'
@@ -78,8 +87,7 @@ update-desktop-database
 %defattr(-,root,root,-)
 %{_bindir}
 %{_datadir}/%{name}/qml
-%{_datadir}/%{name}/jsfiles.qrc
-%{_datadir}/%{name}/translations
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/86x86/apps/%{name}.png
 %{_libdir}/systemd/user/%{name}d.service
 %{_libdir}/systemd/user/user-session.target.wants/%{name}d.service
diff --git a/rpm/rockpool.yaml b/rpm/rockpool.yaml
index 51d72b6..5ec39ca 100644
--- a/rpm/rockpool.yaml
+++ b/rpm/rockpool.yaml
@@ -1,6 +1,6 @@
 Name: rockpool
 Summary: Support for Pebble watches in SailfishOS
-Version: 1.0
+Version: 0.1
 Release: 1
 Group: Qt/Qt
 URL: http://getpebble.com/
@@ -8,7 +8,7 @@ License: GPL3
 Sources:
 - '%{name}-%{version}.tar.xz'
 Description: |
-  Support for Pebble watch to receive events from SailfishOS device via Bluetooth.
+  Support for Pebble watch on SailfishOS devices.
 Configure: none
 Builder: qtc5
 QMakeOptions:
@@ -20,6 +20,9 @@ PkgConfigBR:
 - Qt5Quick
 - Qt5Qml
 - Qt5Core
+- Qt5Network
+- Qt5Location
+- Qt5Organizer
 - mlite5
 - sailfishapp >= 0.0.10
 - icu-i18n
@@ -28,11 +31,11 @@ Requires:
 - sailfishsilica-qt5 >= 0.10.9
 - systemd-user-session-targets
 - nemo-qml-plugin-dbus-qt5
+- quazip
 Files:
 - '%{_bindir}'
 - '%{_datadir}/%{name}/qml'
-- '%{_datadir}/%{name}/jsfiles.qrc'
-- '%{_datadir}/%{name}/translations'
+- '%{_datadir}/applications/%{name}.desktop'
 - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
 - '%{_libdir}/systemd/user/%{name}d.service'
 - '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service'
-- 
cgit v1.2.3