From d0c9968190fc9360652a29d8d09c3db8c37ac844 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 22 Jan 2009 10:58:40 +0000 Subject: [PATCH] - - fix ipmiconsole log directory --- freeipmi-0.6.4-pathsep.patch | 24 ++++++++++++++++++++++++ freeipmi.spec | 10 ++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 freeipmi-0.6.4-pathsep.patch diff --git a/freeipmi-0.6.4-pathsep.patch b/freeipmi-0.6.4-pathsep.patch new file mode 100644 index 0000000..8856ee7 --- /dev/null +++ b/freeipmi-0.6.4-pathsep.patch @@ -0,0 +1,24 @@ +diff -up freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am +--- freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep 2009-01-22 11:44:25.000000000 +0100 ++++ freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.am 2009-01-22 11:44:31.000000000 +0100 +@@ -56,7 +56,7 @@ libipmiconsole_la_LIBADD = ../../../comm + install-data-hook: $(INSTALL_LOGDIR) + + install-logdir: +- $(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole ++ $(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole + + EXTRA_DIST = ipmiconsole.map + +diff -up freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in +--- freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep 2009-01-22 11:44:40.000000000 +0100 ++++ freeipmi-0.6.4/ipmiconsole/src/libipmiconsole/Makefile.in 2009-01-22 11:45:05.000000000 +0100 +@@ -643,7 +643,7 @@ uninstall-am: uninstall-includeHEADERS u + install-data-hook: $(INSTALL_LOGDIR) + + install-logdir: +- $(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole ++ $(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole + + ../../../common/src/libmiscutils.la: force-dependency-check + $(MAKE) -C $(dir $@) $(notdir $@) diff --git a/freeipmi.spec b/freeipmi.spec index 8dc4de2..6c077fd 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -5,9 +5,9 @@ %define name freeipmi %define version 0.6.4 %if %{?_with_debug:1}%{!?_with_debug:0} -%define release 1.debug%{?dist} +%define release 2.debug%{?dist} %else -%define release 1%{?dist} +%define release 2%{?dist} %endif Name: %{name} @@ -20,6 +20,7 @@ Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.g Patch1: freeipmi-0.5.1-regex.patch Patch2: freeipmi-0.6.4-silent.patch Patch3: freeipmi-0.6.4-argmax.patch +Patch4: freeipmi-0.6.4-pathsep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel texinfo Requires(post): info @@ -68,6 +69,7 @@ Provides a tool and a daemon for IPMI node detection. %patch1 -p1 -b .regex %patch2 -p1 -b .silent %patch3 -p1 -b .argmax +%patch4 -p1 -b .pathsep %build CFLAGS=-D_GNU_SOURCE %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ @@ -259,6 +261,7 @@ fi %{_mandir}/man5/ipmidetect.conf.5* %{_mandir}/man7/freeipmi.7* %dir %{_localstatedir}/cache/ipmimonitoringsdrcache +%dir %{_localstatedir}/log/ipmiconsole %files devel %defattr(-,root,root) @@ -315,6 +318,9 @@ fi %{_mandir}/man8/ipmidetectd.8* %changelog +* Thu Jan 22 2009 Karsten Hopp 0.6.4-2 +- fix ipmiconsole log directory + * Mon Jul 28 2008 Phil Knirsch - 0.6.4-1 - Update to freeipmi-0.6.4 - Fixed unecessary logrotate message for bmc-watchdog (#456648)