Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] Fixes MER#557 Stop config package and install.
The config files should be installed per device
  • Loading branch information
lpotter committed Jul 7, 2015
1 parent b11a5f2 commit 4eacd67
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 54 deletions.
22 changes: 2 additions & 20 deletions rpm/sensorfw-qt5-hybris.spec
@@ -1,16 +1,14 @@
Name: hybris-libsensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.8.7
Version: 0.8.17
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
URL: http://gitorious.org/sensorfw
Source0: %{name}-%{version}.tar.bz2
# Eventhough these are really needed we have these here
# as those are added to packaging dir by tar_git.
Source1: sensord-daemon-conf-setup
Source2: sensorfwd.service
Requires: %{name}-configs
Requires: sensord-qt5
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Expand All @@ -22,6 +20,7 @@ BuildRequires: pkgconfig(mlite5)
BuildRequires: pkgconfig(sensord-qt5)
BuildRequires: pkgconfig(libhardware)
BuildRequires: pkgconfig(android-headers)
Obsoletes: %{name}-configs <= 0.8.17

%description
Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.
Expand All @@ -37,18 +36,6 @@ Requires: qt5-qtnetwork-devel
%description devel
Development headers for sensor framework daemon and libraries.


%package configs
Summary: Sensorfw configuration files
Group: System/Libraries
BuildArch: noarch
Requires: %{name} = %{version}
Provides: sensord-configs
Obsoletes: sensorfw-qt5-configs <= 0.7.3.31

%description configs
Sensorfw configuration files.

%prep
%setup -q -n %{name}-%{version}

Expand All @@ -68,7 +55,6 @@ export QT_SELECT=5

%post
/sbin/ldconfig
%{_bindir}/sensord-daemon-conf-setup

%postun
/sbin/ldconfig
Expand All @@ -82,7 +68,3 @@ export QT_SELECT=5
%files devel
%defattr(-,root,root,-)
%{_includedir}/sensord-qt5/*

%files configs
%defattr(-,root,root,-)
%config %{_sysconfdir}/sensorfw/sensord-hybris.conf
6 changes: 1 addition & 5 deletions rpm/sensorfw-qt5.spec
@@ -1,6 +1,6 @@
Name: sensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.8.7
Version: 0.8.17
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand Down Expand Up @@ -137,8 +137,6 @@ systemctl daemon-reload || :

%config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
%dir %{_sysconfdir}/sensorfw
%config %{_sysconfdir}/sensorfw/sensord.conf
%dir %{_sysconfdir}/sensorfw/sensord.conf.d/
%{_unitdir}/sensorfwd.service
%{_unitdir}/graphical.target.wants/sensorfwd.service
%{_bindir}/sensord-daemon-conf-setup
Expand Down Expand Up @@ -182,8 +180,6 @@ systemctl daemon-reload || :
%files configs
%defattr(-,root,root,-)
%config %{_sysconfdir}/sensorfw/sensord.conf.d/*conf
%config %{_sysconfdir}/sensorfw/*conf
%exclude %{_sysconfdir}/sensorfw/sensord.conf

%files docs
%{_prefix}/share/doc/sensord-qt5
1 change: 0 additions & 1 deletion rpm/sensorfwd.service
Expand Up @@ -7,7 +7,6 @@ Conflicts=actdead.target
[Service]
Type=forking
BusName=com.nokia.SensorService
ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
Expand Down
32 changes: 4 additions & 28 deletions sensorfw.pro
Expand Up @@ -59,39 +59,15 @@ contains(CONFIG,hybris) {


equals(QT_MAJOR_VERSION, 5): {
contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
INSTALLS += SENSORDHYBRISCONFIGFILE

} else {
config_hybris {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
INSTALLS += SENSORDHYBRISCONFIGFILE
}
!contains(CONFIG,hybris) {
# config file installation not handled here
DBUSCONFIGFILES.files = sensorfw.conf
DBUSCONFIGFILES.path = /etc/dbus-1/system.d

SENSORDCONFIGFILE.files = config/sensord-rx_51.conf \
config/sensord-oaktrail.conf \
config/sensord-exopc.conf \
config/sensord-aava.conf \
config/sensord-rm_696.conf \
config/sensord-arm_grouper_0000.conf \
config/sensord-mrst_cdk.conf \
config/sensord-ncdk.conf \
config/sensord.conf \
config/sensord-rm_680.conf \
config/sensord-icdk.conf \
config/sensord-u8500.conf \

SENSORDCONFIGFILE.path = /etc/sensorfw
INSTALLS += DBUSCONFIGFILES

SENSORDCONFIGFILES.files = config/90-sensord-default.conf
SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d

INSTALLS += DBUSCONFIGFILES SENSORDCONFIGFILE SENSORDCONFIGFILES
INSTALLS += SENSORDCONFIGFILES

SENSORDCONFIGHELPER.files = rpm/sensord-daemon-conf-setup
SENSORDCONFIGHELPER.path = /usr/bin
Expand Down

0 comments on commit 4eacd67

Please sign in to comment.