diff --git a/freeipmi-0.6.4-pathsep.patch b/freeipmi-0.6.4-pathsep.patch deleted file mode 100644 index f459969..0000000 --- a/freeipmi-0.6.4-pathsep.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.am ---- freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.am.pathsep 2008-09-18 00:56:04.000000000 +0200 -+++ freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.am 2009-02-24 15:21:56.000000000 +0100 -@@ -78,6 +78,6 @@ force-dependency-check: - 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.7.5/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.in ---- freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.in.pathsep 2009-01-13 00:08:56.000000000 +0100 -+++ freeipmi-0.7.5/ipmiconsole/src/libipmiconsole/Makefile.in 2009-02-24 15:23:46.000000000 +0100 -@@ -670,7 +670,7 @@ force-dependency-check: - install-data-hook: $(INSTALL_LOGDIR) - - install-logdir: -- $(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole -+ $(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/freeipmi-0.6.4-silent.patch b/freeipmi-0.6.4-silent.patch deleted file mode 100644 index 5b43fc9..0000000 --- a/freeipmi-0.6.4-silent.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix unecessary logrotate message for bmc-watchdog (#456648) - -diff -up freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate.orig freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate ---- freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate.orig 2009-10-01 20:09:57.000000000 +0200 -+++ freeipmi-0.8.2/bmc-watchdog/bmc-watchdog.logrotate 2010-01-07 16:35:55.000000000 +0100 -@@ -11,6 +11,6 @@ - nomail - notifempty - postrotate -- /etc/init.d/bmc-watchdog condrestart -+ /etc/init.d/bmc-watchdog condrestart >/dev/null 2>&1 - endscript - } diff --git a/freeipmi.spec b/freeipmi.spec index cd7804a..647e278 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -10,8 +10,6 @@ License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/freeipmi/ Source: ftp://ftp.gluster.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz -Patch1: freeipmi-0.6.4-silent.patch -Patch2: freeipmi-0.6.4-pathsep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel texinfo Requires(pre): chkconfig @@ -62,8 +60,6 @@ Provides a tool and a daemon for IPMI node detection. %prep %setup -q -%patch1 -p1 -b .silent -#%patch2 -p1 -b .pathsep %build export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"