diff --git a/qml/harbour-sailtime.qml b/qml/harbour-sailtime.qml index c4ab7eb..ae6dc31 100644 --- a/qml/harbour-sailtime.qml +++ b/qml/harbour-sailtime.qml @@ -63,7 +63,7 @@ ApplicationWindow var uptime_str = checker.fetchUptime(); uptime_str = uptime_str.replace(/^\s+|\s+$/g, ''); - var uptime_re = /\d+:\d\d:\d\d up\s+(?:(\d+) days,\s+)?(?:(?:(\d+):(\d+))|(?:(\d?\d) min)),\s+(\d+) users?,\s+load average: (\d+).(\d\d), (\d+).(\d\d), (\d+).(\d\d)/; + var uptime_re = /\d+:\d\d:\d\d up\s+(?:(\d+) days?,\s+)?(?:(?:(\d+):(\d+))|(?:(\d?\d) min)),\s+(\d+) users?,\s+load average: (\d+).(\d\d), (\d+).(\d\d), (\d+).(\d\d)/; var match = uptime_str.match(uptime_re) //console.log(uptime_str) diff --git a/rpm/harbour-sailtime.spec b/rpm/harbour-sailtime.spec index 6f905b6..f925b16 100644 --- a/rpm/harbour-sailtime.spec +++ b/rpm/harbour-sailtime.spec @@ -1,7 +1,7 @@ -# +# # Do NOT Edit the Auto-generated Part! # Generated by: spectacle version 0.27 -# +# Name: harbour-sailtime @@ -13,22 +13,24 @@ Name: harbour-sailtime %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: SailTime -Version: 1.0 +Version: 1.0.1 Release: 1 Group: Qt/Qt -License: LICENSE +License: MIT Expat licence +URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 Source100: harbour-sailtime.yaml -Requires: sailfishsilica-qt5 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) +Requires: sailfishsilica-qt5 >= 0.10.9 BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(sailfishapp) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 BuildRequires: desktop-file-utils %description -Short description of my SailfishOS Application +SailTime shows how long your phone has been sailing the open seas, or in other words, how long it has been switched on. It also displays the load averages for the last 1, 5 and 15 minutes. +The app also has an automatic refresh feature with a configurable refresh interval of 1 to 60 minutes. %prep %setup -q -n %{name}-%{version} @@ -40,7 +42,7 @@ Short description of my SailfishOS Application # >> build pre # << build pre -%qtc_qmake5 +%qtc_qmake5 %qtc_make %{?_smp_mflags} @@ -62,13 +64,13 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -/usr/share/harbour-sailtime -/usr/share/icons/hicolor/86x86/apps -/usr/share/applications -/usr/bin -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_datadir}/%{name}/qml %{_bindir} +%{_datadir}/%{name}/qml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +/usr/bin +/usr/share/harbour-sailtime +/usr/share/applications +/usr/share/icons/hicolor/86x86/apps # >> files # << files diff --git a/rpm/harbour-sailtime.yaml b/rpm/harbour-sailtime.yaml index 9d33c66..208c151 100644 --- a/rpm/harbour-sailtime.yaml +++ b/rpm/harbour-sailtime.yaml @@ -1,10 +1,10 @@ Name: harbour-sailtime Summary: SailTime -Version: 0.1 +Version: 1.0.1 Release: 1 Group: Qt/Qt URL: http://example.org/ -License: +License: "MIT Expat licence" Sources: - '%{name}-%{version}.tar.bz2' Description: |- @@ -14,19 +14,19 @@ Description: |- Configure: none Builder: qtc5 PkgConfigBR: -- sailfishapp >= 0.0.10 -- Qt5Core -- Qt5Qml - Qt5Quick +- Qt5Qml +- Qt5Core +- sailfishapp >= 0.0.10 Requires: - sailfishsilica-qt5 >= 0.10.9 Files: -- /usr/share/icons/hicolor/86x86/apps -- /usr/share/applications -- /usr/share/harbour-sailtime -- /usr/bin -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/%{name}/qml' - '%{_bindir}' +- '%{_datadir}/%{name}/qml' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- /usr/bin +- /usr/share/harbour-sailtime +- /usr/share/applications +- /usr/share/icons/hicolor/86x86/apps PkgBR: []