merge master

rpm/dsme.spec

@@ -1,17 +1,4 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.27
-# 
-
 Name:       dsme
-
-# >> macros
-%{!?qtc_qmake5:%define qtc_qmake5 qmake}
-%{!?qtc_qmake:%define qtc_qmake qmake}
-%{!?qtc_make:%define qtc_make make}
-%{?qtc_builddir:%define _builddir %qtc_builddir}
-# << macros
-
 Summary:    Device State Management Entity
 Version:    0.65.0
 Release:    0
@@ -21,7 +8,6 @@ URL:        https://github.com/nemomobile/dsme
 Source0:    %{name}-%{version}.tar.gz
 Source1:    dsme.service
 Source2:    dsme-rpmlintrc
-Source100:  dsme.yaml
 Requires:   systemd
 Requires:   statefs
 Requires(preun): systemd
@@ -56,17 +42,12 @@ Test cases and xml test description for DSME
 %prep
 %setup -q -n %{name}-%{version}
 
-# >> setup
-# << setup
-
 %build
 unset LD_AS_NEEDED
-# >> build pre
 ./verify_version.sh
 chmod a+x autogen.sh
 ./autogen.sh
 chmod a+x configure
-# << build pre
 
 %configure --disable-static \
     --without-bmeipc \
@@ -79,34 +60,27 @@ chmod a+x configure
 
 make %{?_smp_mflags}
 
-# >> build post
-# << build post
-
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
 install -D -m 644 %{SOURCE1} %{buildroot}/lib/systemd/system/%{name}.service
 install -d %{buildroot}/lib/systemd/system/multi-user.target.wants/
 ln -s ../%{name}.service %{buildroot}/lib/systemd/system/multi-user.target.wants/%{name}.service
 install -d %{buildroot}/var/lib/dsme
 [ ! -f %{buildroot}/var/lib/dsme/alarm_queue_status ] && echo 0 > %{buildroot}/var/lib/dsme/alarm_queue_status
-# << install post
 
 %preun
 if [ "$1" -eq 0 ]; then
-systemctl stop %{name}.service
+  systemctl stop %{name}.service || :
 fi
 
 %post
-systemctl daemon-reload
-systemctl reload-or-try-restart %{name}.service
+systemctl daemon-reload || :
+systemctl reload-or-try-restart %{name}.service || :
 
 %postun
-systemctl daemon-reload
+systemctl daemon-reload || :
 
 %files
 %defattr(-,root,root,-)
@@ -119,11 +93,8 @@ systemctl daemon-reload
 /lib/systemd/system/multi-user.target.wants/%{name}.service
 /var/lib/dsme
 %config(noreplace) /var/lib/dsme/alarm_queue_status
-# >> files
-# << files
 
 %files tests
 %defattr(-,root,root,-)
 /opt/tests/dsme-tests/*
-# >> files tests
-# << files tests
+