diff --git a/ser2net.spec b/ser2net.spec index 6fa8ab9..5333617 100644 --- a/ser2net.spec +++ b/ser2net.spec @@ -1,14 +1,14 @@ -%global _unitdir /lib/systemd/system/ - Name: ser2net Summary: Proxy that allows tcp connections to serial ports Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System Source0: http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz Source1: %{name}.service URL: http://ser2net.sourceforge.net/ +BuildRequires: systemd-units +Requires(post): systemd-sysv Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -34,30 +34,35 @@ mkdir -p %{buildroot}%{_unitdir} install %{SOURCE1} %{buildroot}%{_unitdir} %post -if [ $1 -eq 2 ]; then - # Package upgrade - if [ -f %{_initddir}/ser2net ] ; then - if /sbin/chkconfig ser2net; then - /bin/systemctl enable ser2net.service >/dev/null 2>&1 || : - fi - fi +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi -/bin/systemctl daemon-reload >/dev/null 2>&1 || : %preun -if [ $1 -eq 0 ]; then - # Package removal, not upgrade - /bin/systemctl disable ser2net.service > /dev/null 2>&1 || : - /bin/systemctl stop ser2net.service > /dev/null 2>&1 || : +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable ser2net.service > /dev/null 2>&1 || : + /bin/systemctl stop ser2net.service > /dev/null 2>&1 || : fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ]; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ser2net.service >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart ser2net.service >/dev/null 2>&1 || : fi +%triggerun -- ser2net < 2.7-3 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply ser2net +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save ser2net >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del ser2net >/dev/null 2>&1 || : +/bin/systemctl try-restart ser2net.service >/dev/null 2>&1 || : + %files %defattr(-,root,root) %doc COPYING ChangeLog AUTHORS README @@ -67,6 +72,9 @@ fi %{_mandir}/man8/%{name}* %changelog +* Fri May 06 2011 Tom Callaway - 2.7-4 +- fixed scriptlets + * Wed Feb 09 2011 Tom Callaway - 2.7-3 - systemd enablement - rawhide spec cleanup