adding makeconfig into sailfish RPM package

rinigus · Jul 3, 2016 · d89961b · d89961b
1 parent bb7a2a8
commit d89961b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/configs/default.json → configs/sfos-n4.json b/configs/default.json → configs/sfos-n4.json
diff --git a/qml/HelpText.qml b/qml/HelpText.qml
@@ -91,16 +91,16 @@ configuration to get it detected.</p>
 
 <h3>Make configuration using a helper script</h3>
 
-<p>The helper script requires python2.7 .</p>
+<p>The helper script requires python2.7, which should be installed as dependency in Sailfish .</p>
 
 <p>Get the helper script from the GUI source tree in GitHub:
-<a href=https://github.com/rinigus/systemdatascope/blob/master/tools/makeconfig.py>
-https://github.com/rinigus/systemdatascope/blob/master/tools/makeconfig.py
-</a> .</p>
+<a href=https://github.com/rinigus/systemdatascope/blob/master/tools/systemdatascope-makeconfig>
+https://github.com/rinigus/systemdatascope/blob/master/tools/systemdatascope-makeconfig.py
+</a> . In Sailfish, the script is installed as a part of a RPM package. </p>
 
 <p>Run script:</p>
 
-<p><tt>python makeconfig.py /tmp/collectd/Jolla > myconf.json </tt></p>
+<p><tt>systemdatascope-makeconfig /tmp/collectd/Jolla > myconf.json </tt></p>
 
 <p>where the first argument is the directory with collectd
 datasets. Check the configuration by looking into the generated
@@ -120,8 +120,8 @@ reload it again in Settings.</p>
 <p>Some configurations would be provided online. At present, there
 is a configuration for Nexus 4 running Sailfish at GitHub in GUI
 source tree under configs:
-<a href=https://github.com/rinigus/systemdatascope/blob/master/configs/default.json>
-https://github.com/rinigus/systemdatascope/blob/master/configs/default.json</a></p>
+<a href=https://github.com/rinigus/systemdatascope/blob/master/configs/sfos-n4.json>
+https://github.com/rinigus/systemdatascope/blob/master/configs/sfos-n4.json</a></p>
 
 <p>To load the configuration given online, insert URL in Settings
 and press Load button. Loading is performed using QML

diff --git a/rpm/systemdatascope.spec b/rpm/systemdatascope.spec
@@ -23,6 +23,7 @@ Source100:  systemdatascope.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
 Requires:   rrdtool
 Requires:   collectd
+Requires:   python
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)

diff --git a/rpm/systemdatascope.yaml b/rpm/systemdatascope.yaml
@@ -37,6 +37,7 @@ Requires:
   - sailfishsilica-qt5 >= 0.10.9
   - rrdtool
   - collectd
+  - python
 
 # All installed files
 Files:

diff --git a/systemdatascope_silica.pro b/systemdatascope_silica.pro
@@ -19,6 +19,10 @@ qml.files = qml/*.qml qml/Platform qml/Platform.silica
 qml.path = /usr/share/$${TARGET}
 INSTALLS += qml
 
+confscript.files = tools/systemdatascope-makeconfig
+confscript.path = /usr/bin
+INSTALLS += confscript
+
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
 
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

diff --git a/tools/makeconfig.py → tools/systemdatascope-makeconfig b/tools/makeconfig.py → tools/systemdatascope-makeconfig
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ Requires: @@
       - sailfishsilica-qt5 >= 0.10.9
       - rrdtool
       - collectd
+      - python
     # All installed files
     Files:
@@ Expand Down @@