- package systemd units

Changed files:
    nut.spec -> 1.176
    systemd-sysconfig.patch -> 1.1

2 files changed, 39 insertions, 0 deletions

diff --git a/nut.spec b/nut.spec
index 01a69ac..bd4464a 100644
--- a/nut.spec
+++ b/nut.spec
@@ -26,6 +26,7 @@ Patch1:		%{name}-config.patch
 Patch2:		%{name}-smartdp-load.patch
 Patch3:		%{name}-upssched-cmd-sysconf.patch
 Patch4:		%{name}-matrix.patch
+Patch5:		systemd-sysconfig.patch
 URL:		http://www.networkupstools.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -189,6 +190,7 @@ Pliki do integracji NUT-a z HAL-em.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -231,6 +233,10 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ups
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/upsmon
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/upsmon
 
+# mask sysv services for systemd because of different naming
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/ups.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/upsmon.service
+
 for i in $RPM_BUILD_ROOT%{_sysconfdir}/*.sample; do
 	mv -f $i ${i%.sample}
 done
@@ -306,9 +312,13 @@ fi
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.conf
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ups.conf
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.users
+%{systemdunitdir}/nut-driver.service
+%{systemdunitdir}/nut-server.service
+%{systemdunitdir}/ups.service
 %{_mandir}/man5/ups.conf.5*
 %{_mandir}/man5/upsd.conf.5*
 %{_mandir}/man5/upsd.users.5*
+%{_mandir}/man8/nut-recorder.8*
 %{_mandir}/man8/nut-scanner.8*
 %{_mandir}/man8/upscmd.8*
 %{_mandir}/man8/upscode2.8*
@@ -428,6 +438,9 @@ fi
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upssched.conf
 %attr(750,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upssched-cmd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/upsmon
+/lib/systemd/system-shutdown/nutshutdown
+%{systemdunitdir}/nut-monitor.service
+%{systemdunitdir}/upsmon.service
 %{_mandir}/man5/upsmon.conf.5*
 %{_mandir}/man5/upssched.conf.5*
 %{_mandir}/man8/upsc.8*
@@ -463,6 +476,8 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libupsclient.so
+%attr(755,root,root) %{_libdir}/libnutscan.so
 %{_pkgconfigdir}/libupsclient.pc
+%{_pkgconfigdir}/libnutscan.pc
 %{_includedir}/*.h
 %{_mandir}/man3/*.3*
diff --git a/systemd-sysconfig.patch b/systemd-sysconfig.patch
new file mode 100644
index 0000000..0bfae77
--- /dev/null
+++ b/systemd-sysconfig.patch
@@ -0,0 +1,24 @@
+--- nut-2.6.4/scripts/systemd/nut-server.service.in.orig	2012-06-23 23:05:33.638939671 +0200
++++ nut-2.6.4/scripts/systemd/nut-server.service.in	2012-06-23 23:13:37.038936168 +0200
+@@ -5,7 +5,8 @@
+ Before=nut-monitor.service
+ 
+ [Service]
+-ExecStart=@SBINDIR@/upsd 
++EnvironmentFile=-/etc/sysconfig/ups
++ExecStart=@SBINDIR@/upsd $UPSD_OPTIONS
+ Type=forking
+ 
+ [Install]
+--- nut-2.6.4/scripts/systemd/nut-monitor.service.in.orig	2012-05-02 23:35:36.000000000 +0200
++++ nut-2.6.4/scripts/systemd/nut-monitor.service.in	2012-06-23 23:14:10.582269261 +0200
+@@ -3,7 +3,8 @@
+ After=local-fs.target network.target nut-server.service
+ 
+ [Service]
+-ExecStart=@SBINDIR@/upsmon
++EnvironmentFile=-/etc/sysconfig/upsmon
++ExecStart=@SBINDIR@/upsmon $PROGRAM_ARGS
+ PIDFile=@PIDPATH@/upsmon.pid
+ Type=forking
+