Use version from yaml file on sailfishOS, bump version

diff --git a/application/application.pro b/application/application.pro
index 70d547b..136b56c 100755 (executable)
--- a/application/application.pro
+++ b/application/application.pro
@@ -4,7 +4,9 @@
 #
 #-------------------------------------------------
 
-VERSION = 0.6.2
+isEmpty(VERSION) {
+    VERSION = 0.6.2
+}
 USE_RESOURCES = 0
 
 QT += network
@@ -47,7 +49,7 @@ harmattan {
     QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -Wno-psabi
     QMAKE_LFLAGS += -pie -rdynamic
     PLATFORM_SOURCES = view.cpp
-    PLATFORM_HEADERS = view.h view_qt4.h
+    GETTFORM_HEADERS = view.h view_qt4.h
 }
 maemo5 {
     QT += maemo5
@@ -65,6 +67,9 @@ maemo5 {
         keypressforwarder.h \
         settingsdialog.h \
         stationview.h
+    FORMS += \
+        settingsdialog.ui \
+        stationlistview.ui
 }
 !sailfish:!harmattan:!maemo5 {
     PLATFORM = desktop
@@ -115,10 +120,6 @@ HEADERS += \
     stationschedulemodel.h \
     stationscheduleitem.h
 
-FORMS += \
-    settingsdialog.ui \
-    stationlistview.ui
-
 QMLSOURCES = \
     resources/harmattan/qml/main.qml \
     resources/harmattan/qml/StationListPage.qml \

diff --git a/quandoparte.pro b/quandoparte.pro
index cae6f9a..63d9434 100644 (file)
--- a/quandoparte.pro
+++ b/quandoparte.pro
@@ -1,5 +1,9 @@
 TEMPLATE = subdirs
 
+isEmpty(VERSION) {
+    VERSION = 0.6.2
+}
+
 SUBDIRS = application
 
 OTHER_FILES += \

diff --git a/rpm/quandoparte.yaml b/rpm/quandoparte.yaml
index d73175b..fe109dc 100755 (executable)
--- a/rpm/quandoparte.yaml
+++ b/rpm/quandoparte.yaml
@@ -1,37 +1,46 @@
 Name: quandoparte
 Summary: Quando Parte
-Version: 0.6.2
+Version: 0.7.0
 Release: 0
 Group: Qt/Qt
 License: GPL v2 or above
 Sources:
 - '%{name}-%{version}.tar.bz2'
 SCM: git@github.com:mikelima/quandoparte.git
+URL: http://quandoparte.garage.maemo.org/
 Description: |-
   Virtual Arrivals and Departures board for Italian trains quandoparte
   uses the Trenitalia data to show arrival and departure times of trains of a given station, with delay or suppression information.
 Configure: none
 Builder: qtc5
+QMakeOptions: VERSION=%{version} TARGET=%{name} CONFIG+=sailfish
 PkgConfigBR:
-- qdeclarative5-boostable
-- Qt5WebKitWidgets
-- Qt5WebKit
-- Qt5Quick
-- Qt5Qml
-- Qt5Core
-- Qt5Concurrent
 - Qt5Location
+- Qt5Concurrent
+- Qt5Core
+- Qt5Qml
+- Qt5Quick
+- Qt5WebKit
+- Qt5WebKitWidgets
+- qdeclarative5-boostable
 Requires:
-- qt5-qtdeclarative-import-location
-- mapplauncherd-booster-silica-qt5
-- sailfishsilica-qt5
-- qt5-qtlocation
 - qt5-qtconcurrent
+- qt5-qtlocation
+- sailfishsilica-qt5
+- mapplauncherd-booster-silica-qt5
+- qt5-qtdeclarative-import-location
 Files:
-- '%{_bindir}'
-- '%{_datadir}/apps/quandoparte/qml'
-- '%{_datadir}/apps/quandoparte/stations'
-- '%{_datadir}/apps/quandoparte/i18n'
-- '%{_datadir}/applications'
 - '%{_datadir}/icons/hicolor/86x86/apps'
+- '%{_datadir}/applications'
+- '%{_datadir}/apps/quandoparte/i18n'
+- '%{_datadir}/apps/quandoparte/stations'
+- '%{_datadir}/apps/quandoparte/qml'
+- '%{_bindir}'
+- 
+- /usr/bin
+- /usr/share/applications
+- /usr/share/apps/quandoparte/i18n
+- /usr/share/apps/quandoparte/stations
+- /usr/share/icons/hicolor/86x86/apps
+- /usr/share/apps/quandoparte/qml
 PkgBR: []