Merge pull request #13 from rburchell/master

Restore CONFIG+=mce
sailfishos · Oct 5, 2013 · aa7b925 · aa7b925
2 parents c0e202e + b6ad616
commit aa7b925
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/rpm/sensord.service b/rpm/sensord.service
@@ -6,7 +6,7 @@ Requires=dbus.socket
 [Service]
 Type=forking 
 ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
-ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-target=8 --log-level=warning
+ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -19,6 +19,7 @@ Source1:    sensorfw-rpmlintrc
 Source2:    sensord.service
 Source3:    sensord-daemon-conf-setup
 Source100:  sensorfw-qt5.yaml
+Requires:   mce
 Requires:   qt5-qtcore
 Requires:   GConf-dbus
 Requires:   %{name}-configs
@@ -33,6 +34,7 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(mce)
 Provides:   sensord-qt5
 Obsoletes:   sensorframework
 
@@ -97,7 +99,8 @@ export LD_RUN_PATH=/usr/lib/sensord/
 export QT_SELECT=5
 # << build pre
 
-%qmake5 
+%qmake5  \
+    CONFIG+=mce
 
 make %{?_smp_mflags}
 

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -13,6 +13,7 @@ Sources:
     - "sensord.service"
     - "sensord-daemon-conf-setup"
 Requires:
+    - mce
     - qt5-qtcore
     - GConf-dbus
     - "%{name}-configs"
@@ -23,9 +24,8 @@ PkgConfigBR:
     - Qt5Network
     - Qt5Test
     - gconf-2.0
-#PkgBR:
-#    - doxygen
-#    - graphviz
+    - mce
+
 Obsoletes:
     - sensorframework
 
@@ -36,7 +36,8 @@ Configure: none
 Builder: qmake5
 UseAsNeeded: no
 
-#QMakeOptions:
+QMakeOptions:
+    - "CONFIG+=mce"
 
 SubPackages:
     - Name: devel

diff --git a/tests/testapp/main.cpp b/tests/testapp/main.cpp
@@ -74,8 +74,6 @@ void printUsage()
     qDebug() << "                                  can also be notched up by sending SIGUSR1 to";
     qDebug() << "                                  the process. Valid values for N are: 'test',";
     qDebug() << "                                  'debug', 'warning', 'critical'.\n";
-    qDebug() << " --log-target=N                   logging target mask (1=stdout, 2=stderr, 4=file, 8=syslog and combos e.g. 3=stdout|stderr\n";
-    qDebug() << " --log-file-path=P                Log file path\n";
     qDebug() << " -c=P, --config-file=P            Load configuration from P. By default";
     qDebug() << "                                  /usr/share/sensorfw-tests/testapp.conf is used.\n";
     qDebug() << " -m=N  --model=N                  Start clients in single thread model or multithread mode. (1=single thread(default), 2=multithread)\n";