Hello community, here is the log from the commit of package safte-monitor for openSUSE:Factory checked in at 2012-10-19 08:52:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/safte-monitor (Old) and /work/SRC/openSUSE:Factory/.safte-monitor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "safte-monitor", Maintainer is "h...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/safte-monitor/safte-monitor.changes 2011-09-23 12:45:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.safte-monitor.new/safte-monitor.changes 2012-10-19 08:52:40.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 18 00:20:30 UTC 2012 - ldun...@suse.com + +- Add safte-monitor-create-state-run-dir-on-init.patch: create + /var/run/safte-monitor at service start time instead of install + time. (bnc#710293) + +------------------------------------------------------------------- New: ---- safte-monitor-create-state-run-dir-on-init.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ safte-monitor.spec ++++++ --- /var/tmp/diff_new_pack.6p8R0d/_old 2012-10-19 08:52:43.000000000 +0200 +++ /var/tmp/diff_new_pack.6p8R0d/_new 2012-10-19 08:52:43.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package safte-monitor (Version 0.0.5) +# spec file for package safte-monitor # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: safte-monitor Obsoletes: saftemon Summary: Linux SAF-TE SCSI enclosure monitor +License: GPL-2.0+ +Group: System/Monitoring Version: 0.0.5 -Release: 370 +Release: 0 Url: http://oss.metaparadigm.com/safte-monitor/ Source0: %{name}-%{version}.tar.gz Patch0: %{name}-%{version}.diff Patch1: safte-monitor-fix.patch Patch2: safte-monitor.ioctl.patch -License: GPL-2.0+ -Group: System/Monitoring +Patch3: safte-monitor-create-state-run-dir-on-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 800 PreReq: %fillup_prereq %insserv_prereq @@ -59,6 +58,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 %build rm -f config.cache config.log config.status @@ -101,8 +101,7 @@ /usr/bin/safte-monitor /usr/sbin/rcsafte-monitor /usr/lib/safte-monitor -%defattr(-,daemon,root) -/var/run/safte-monitor -/var/log/safte-monitor +%attr(755,daemon,root) %ghost /var/run/safte-monitor +%attr(-,daemon,root) /var/log/safte-monitor %changelog ++++++ safte-monitor-create-state-run-dir-on-init.patch ++++++ diff -rup safte-monitor-0.0.5.orig/redhat/init.d/safte-monitor safte-monitor-0.0.5/redhat/init.d/safte-monitor --- safte-monitor-0.0.5.orig/redhat/init.d/safte-monitor 2012-10-17 13:14:39.215147453 -0700 +++ safte-monitor-0.0.5/redhat/init.d/safte-monitor 2012-10-17 15:14:42.462471214 -0700 @@ -20,6 +20,8 @@ SAFTEMONITOR=/usr/bin/safte-monitor [ -x $SAFTEMONITOR ] || exit 0 +SAFTEMONRUNDIR=/var/run/safte-monitor + # Source config if [ -f /etc/sysconfig/safte-monitor ] ; then . /etc/sysconfig/safte-monitor @@ -32,6 +34,11 @@ umask 077 start() { echo -n $"Starting SCSI enclosure monitor " + # the state run directory can go away between reboots + if [ ! -d $SAFTEMONRUNDIR ] ; then + mkdir -p $SAFTEMONRUNDIR + chown daemon:root $SAFTEMONRUNDIR + fi startproc $SAFTEMONITOR $SAFTEMONITOR_OPTIONS rc_status -v } @@ -70,7 +77,7 @@ case "$1" in exit 3 ;; try-restart) - [ -f /var/run/safte-monitor/pid ] && restart || : + [ -f $SAFTEMONRUNDIR/pid ] && restart || : ;; *) echo $"Usage: $0 {start|stop|status|restart|try-restart}" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
