diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:17:53 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:49:07 +0200 |
| commit | c2c141ed1e13e6f0fbc740d0ff37caba0b2a7c08 (patch) | |
| tree | a7892e105c85c7d4a32d3b3202e60ec2131e42c8 /rpm | |
| parent | c9c1ed9faee07c0067827872ffe465d465c81470 (diff) | |
| parent | 9f8db04d6059e0b220e36a064d694a1b0649f5f0 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'rpm')
| -rw-r--r-- | rpm/pebble.spec | 5 | ||||
| -rw-r--r-- | rpm/pebble.yaml | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/rpm/pebble.spec b/rpm/pebble.spec index eaf223f..71d5d46 100644 --- a/rpm/pebble.spec +++ b/rpm/pebble.spec @@ -13,7 +13,7 @@ Name: pebble %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Support for Pebble watch in SailfishOS -Version: 0.6 +Version: 0.7 Release: 1 Group: Qt/Qt License: BSD @@ -46,7 +46,8 @@ Include support for Pebble watch to receive event from SailfishOS device. Commun # >> build pre # << build pre -%qtc_qmake5 +%qtc_qmake5 \ + VERSION='%{version}-%{release}' %qtc_make %{?_smp_mflags} diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml index c8979ad..4934f05 100644 --- a/rpm/pebble.yaml +++ b/rpm/pebble.yaml @@ -1,6 +1,6 @@ Name: pebble Summary: Support for Pebble watch in SailfishOS -Version: 0.6 +Version: 0.7 Release: 1 Group: Qt/Qt URL: http://getpebble.com/ @@ -11,6 +11,8 @@ Description: | Include support for Pebble watch to receive event from SailfishOS device. Communicates via Bluetooth, supporting the Pebble protocol. Configure: none Builder: qtc5 +QMakeOptions: +- VERSION='%{version}-%{release}' PkgConfigBR: - Qt5DBus - Qt5Bluetooth |