[ser2net] systemd enablement, rawhide cleanups

[Tom Callaway]

commit 540a2e6c544d22cef9ee6231e6845e30366a0926
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Feb 9 15:15:35 2011 -0500

    systemd enablement, rawhide cleanups

 ser2net.service |   11 +++++++++
 ser2net.spec    |   65 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 48 insertions(+), 28 deletions(-)
---
diff --git a/ser2net.service b/ser2net.service
new file mode 100644
index 0000000..fcf054e
--- /dev/null
+++ b/ser2net.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Proxy that allows tcp connections to serial ports
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ser2net
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/ser2net.spec b/ser2net.spec
index d3352df..6fa8ab9 100644
--- a/ser2net.spec
+++ b/ser2net.spec
@@ -1,19 +1,17 @@
+%global _unitdir /lib/systemd/system/
+
 Name:		ser2net
 Summary: 	Proxy that allows tcp connections to serial ports
 Version:	2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz
-# Filed upstream:
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2074265&group_id=28625&atid=393783
-Patch0:		ser2net-2.5-initfixes.patch
+Source1:	%{name}.service
 URL:		http://ser2net.sourceforge.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description
 ser2net provides a way for a user to connect from a network connection to a 
@@ -23,45 +21,56 @@ monitoring ports, and controlling ports.
 
 %prep
 %setup -q
-%patch0 -p1 -b .initfixes
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m0644 ser2net.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install ser2net.init $RPM_BUILD_ROOT%{_initrddir}/ser2net
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m0644 ser2net.conf %{buildroot}%{_sysconfdir}
+mkdir -p %{buildroot}%{_unitdir}
+install %{SOURCE1} %{buildroot}%{_unitdir}
 
 %post
-/sbin/chkconfig --add ser2net
+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
+fi
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %preun
-if test [ $1  = 0 ]; then
-	/sbin/service ser2net stop >/dev/null 2>&1 || :
-	/sbin/chkconfig --del ser2net
+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 || :
 fi
 
 %postun
-if [ "$1" -ge "1" ]; then
-	/sbin/service ser2net condrestart >/dev/null 2>&1 || :
+/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 || :
 fi
 
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog AUTHORS README
-%attr(0755,root,root) %{_initrddir}/ser2net
-%config(noreplace) %{_sysconfdir}/ser2net.conf
-%{_sbindir}/ser2net
-%{_mandir}/man8/ser2net*
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%{_unitdir}/%{name}.service
+%{_sbindir}/%{name}
+%{_mandir}/man8/%{name}*
 
 %changelog
+* Wed Feb 09 2011 Tom Callaway <tcallawa at redhat.com> - 2.7-3
+- systemd enablement
+- rawhide spec cleanup
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild