Fix and clean hybris packaging.

Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com>

rpm/sensorfw-qt5-hybris.spec

@@ -1,21 +1,16 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.27
-# 
-
 Name:       hybris-libsensorfw-qt5
-
-# >> macros
-# << macros
-
 Summary:    Sensor Framework Qt5
 Version:    0.7.3.13
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+
 URL:        http://gitorious.org/sensorfw
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  sensorfw-qt5-hybris.yaml
+# 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:    sensorfw-rpmlintrc
+Source3:    sensord.service
 Requires:   qt5-qtcore
 Requires:   GConf-dbus
 Requires:   %{name}-configs
@@ -65,63 +60,36 @@ Sensorfw configuration files.
 %prep
 %setup -q -n %{name}-%{version}
 
-# >> setup
-# << setup
-
 %build
 unset LD_AS_NEEDED
-# >> build pre
 export LD_RUN_PATH=/usr/lib/sensord/
 export QT_SELECT=5
-# << build pre
 
 %qmake5 CONFIG+=hybris
 
 make %{?jobs:-j%jobs}
 
-# >> build post
-# << build post
-
 %install
 rm -rf %{buildroot}
-# >> install pre
 export QT_SELECT=5
-# << install pre
 %qmake5_install
 
-# >> install post
-# << install post
-
-%preun
-if [ "$1" -eq 0 ]; then
-systemctl stop sensord.service
-fi
-
 %post
 /sbin/ldconfig
-systemctl daemon-reload
-systemctl reload-or-try-restart sensord.service
 
 %postun
 /sbin/ldconfig
-systemctl daemon-reload
 
 %files
 %defattr(-,root,root,-)
-# >> files
 %{_libdir}/libhybrissensorfw*.so.*
 %{_libdir}/libhybrissensorfw*.so
 %{_libdir}/sensord-qt5/*.so
-# << files
 
 %files devel
 %defattr(-,root,root,-)
-# >> files devel
 %{_includedir}/sensord-qt5/*
-# << files devel
 
 %files configs
 %defattr(-,root,root,-)
-# >> files configs
 %config %{_sysconfdir}/sensorfw/sensord-hybris.conf
-# << files configs