Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] remove mce, change daemon output to syslog/journal
  • Loading branch information
Lorn Potter committed May 5, 2013
1 parent 45dfcc5 commit 14f7c8d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 14 deletions.
3 changes: 2 additions & 1 deletion makedist
Expand Up @@ -15,10 +15,11 @@ PROJECT=sensorfw
# Parse it from any Qt *.pro or *.pri files in CWD:
# PROJECT=$(grep -E "TARGET ?= ?" *.pr[io]|cut -d' ' -f3)

while getopts ht: o
while getopts qht: o
do case $o in
h) head=1;;
t) TAG="$OPTARG";;
q) PROJECT=sensorfw-qt5;;
?) printf >&2 "Usage: $0 [-h] [-t TAG]\n"
exit 2;;
esac
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensord.service
Expand Up @@ -5,7 +5,7 @@ After=boardname.service
[Service]
Type=forking
ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-target=4 --log-file-path=/var/log/sensord.log
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-target=8 --log-level=warning
ExecReload=/bin/kill -HUP $MAINPID

[Install]
Expand Down
17 changes: 11 additions & 6 deletions rpm/sensorfw-qt5.spec
Expand Up @@ -9,7 +9,7 @@ Name: sensorfw-qt5
# << macros

Summary: Sensor Framework Qt5
Version: 0.7.2.2
Version: 0.7.2.4
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand All @@ -33,7 +33,7 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(mce)
#BuildRequires: pkgconfig(mce)

Obsoletes: sensorframework

Expand Down Expand Up @@ -94,8 +94,9 @@ export LD_RUN_PATH=/usr/lib/sensord/
# << build pre

export QT_SELECT=5
%qmake \
CONFIG+=mce
%qmake5
#\
# CONFIG+=mce

make %{?jobs:-j%jobs}

Expand Down Expand Up @@ -132,6 +133,12 @@ systemctl reload-or-try-restart sensord.service
/sbin/ldconfig
systemctl daemon-reload

%post tests
/sbin/ldconfig

%postun tests
/sbin/ldconfig

%files
%defattr(-,root,root,-)
# >> files
Expand All @@ -158,8 +165,6 @@ systemctl daemon-reload
%{_libdir}/pkgconfig/*
%{_includedir}/sensord-qt5/*
%{_datadir}/qt5/mkspecs/features/sensord.prf
# From docs
#%attr(644,root,root)%{_defaultdocdir}/sensord/html/*
# << files devel

%files tests
Expand Down
6 changes: 2 additions & 4 deletions rpm/sensorfw-qt5.yaml
@@ -1,6 +1,6 @@
Name: sensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.7.2.2
Version: 0.7.2.4
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand All @@ -20,7 +20,6 @@ Requires:
PkgConfigBR:
- Qt5Core
- gconf-2.0
- mce

#PkgBR:
# - doxygen
Expand All @@ -33,8 +32,7 @@ Configure: none
Builder: qmake5
UseAsNeeded: no

QMakeOptions:
- "CONFIG+=mce"
#QMakeOptions:

SubPackages:
- Name: devel
Expand Down
3 changes: 2 additions & 1 deletion rpm/sensorfw.spec
Expand Up @@ -9,7 +9,7 @@ Name: sensorfw
# << macros

Summary: Sensor Framework
Version: 0.7.2.2
Version: 0.7.2.4
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand All @@ -23,6 +23,7 @@ Requires: qt
Requires: GConf-dbus
Requires: %{name}-configs
Requires: systemd
Requires: mce
Requires(preun): systemd
Requires(post): /sbin/ldconfig
Requires(post): systemd
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensorfw.yaml
@@ -1,6 +1,6 @@
Name: sensorfw
Summary: Sensor Framework
Version: 0.7.2.2
Version: 0.7.2.4
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand Down
2 changes: 2 additions & 0 deletions sensorfw.pro
Expand Up @@ -57,3 +57,5 @@ equals(QT_MAJOR_VERSION, 5): {
OTHER_FILES += rpm/sensorfw-qt5.spec \
rpm/sensorfw-qt5.yaml
}

OTHER_FILES += config/*

0 comments on commit 14f7c8d

Please sign in to comment.