packages: ipmiutil/ipmiutil-am2.patch, ipmiutil/ipmiutil-make-jN.patch, ipm...
gotar
gotar at pld-linux.org
Tue Jan 5 15:33:15 CET 2010
Author: gotar Date: Tue Jan 5 14:33:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 2.2.4
---- Files affected:
packages/ipmiutil:
ipmiutil-am2.patch (1.3 -> 1.4) , ipmiutil-make-jN.patch (1.4 -> 1.5) , ipmiutil.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/ipmiutil/ipmiutil-am2.patch
diff -u packages/ipmiutil/ipmiutil-am2.patch:1.3 packages/ipmiutil/ipmiutil-am2.patch:1.4
--- packages/ipmiutil/ipmiutil-am2.patch:1.3 Thu Aug 28 06:43:57 2008
+++ packages/ipmiutil/ipmiutil-am2.patch Tue Jan 5 15:33:09 2010
@@ -22,13 +22,14 @@
ipmi_port_SOURCES = ipmi_port.c
-@@ -82,9 +84,5 @@
+@@ -82,10 +84,5 @@
all-am: Makefile $(sbin_PROGRAMS) $(EXTRA_PROGRAMS)
-install-data-am: $(EXTRA_PROGRAMS)
- $(INSTALLBIN) events $(DESTDIR)/$(datadir)/ipmiutil
- $(INSTALLBIN) ipmi_port $(DESTDIR)/$(datadir)/ipmiutil
+- cd $(DESTDIR)/$(sbindir); strip $(sbin_PROGRAMS)
-
clean-generic:
rm -f $(EXTRA_PROGRAMS) $(OLDPROGS) $(TESTPROGS)
================================================================
Index: packages/ipmiutil/ipmiutil-make-jN.patch
diff -u packages/ipmiutil/ipmiutil-make-jN.patch:1.4 packages/ipmiutil/ipmiutil-make-jN.patch:1.5
--- packages/ipmiutil/ipmiutil-make-jN.patch:1.4 Thu Aug 28 06:43:58 2008
+++ packages/ipmiutil/ipmiutil-make-jN.patch Tue Jan 5 15:33:10 2010
@@ -1,19 +1,19 @@
--- ipmiutil-2.2.0/util/Makefile.am.orig 2008-08-25 22:08:37.000000000 +0200
+++ ipmiutil-2.2.0/util/Makefile.am 2008-08-28 00:43:08.614118386 +0200
-@@ -52,44 +52,22 @@
+@@ -52,47 +52,23 @@
LDADD += -lpthread
sbin_PROGRAMS = ipmiutil idiscover
-EXTRA_PROGRAMS = events ipmi_port libipmiutil.a
+EXTRA_PROGRAMS = events ipmi_port
+noinst_LTLIBRARIES = libipmiutil.la libimbapi.la
- TESTPROGS = bmcconfig xmlconfig
+ TESTPROGS = bmcconfig xmlconfig ipmimv
OLDPROGS = alarms bmchealth fruconfig getevent hwreset icmd isolconsole pefconfig sensor showsel tmconfig wdt
# xmlconfig dropped
# To build an imb api library (libimbapi.a):
-libimbapi.a: imbapi.c
-- $(CC) -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c
+- $(CC) -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c
- $(AR) cru libimbapi.a imbapi.o
- $(RANLIB) libimbapi.a
- rm -f imbapi.o
@@ -22,20 +22,23 @@
# To build a lib to support all of the IPMI drivers (libipmiutil.a)
-libipmiutil.a: $(CMDMOD:.c=.o) @LANPLUS_LIB@
-- if [ -f @LANPLUS_LIB@ ]; then \
+- if [ -f "@LANPLUS_LIB@" ]; then \
- ar x @LANPLUS_LIB@ ; fi
- $(AR) cru libipmiutil.a $(CMDMOD:.c=.o) $(LANPLUS_OBJ)
- $(RANLIB) libipmiutil.a
-- if [ -f @LANPLUS_LIB@ ]; then \
+- if [ -f "@LANPLUS_LIB@" ]; then \
- rm -f $(LANPLUS_OBJ) ; fi
+libipmiutil_la_SOURCES = $(CMDMOD)
+libipmiutil_la_LIBADD = @LANPLUS_LIB@
+libipmiutil_la_CFLAGS = $(AM_CFLAGS)
# To build ipmiutil, need to use METACFLAGS for each .c/.o
--
+
-idiscover: idiscover.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
+-
+-ipmimv: ipmimv.c
+- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST_BIN -o ipmimv ipmimv.c
-
-events: events.c
- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c
================================================================
Index: packages/ipmiutil/ipmiutil.spec
diff -u packages/ipmiutil/ipmiutil.spec:1.16 packages/ipmiutil/ipmiutil.spec:1.17
--- packages/ipmiutil/ipmiutil.spec:1.16 Thu Nov 13 13:53:45 2008
+++ packages/ipmiutil/ipmiutil.spec Tue Jan 5 15:33:10 2010
@@ -3,8 +3,8 @@
Summary: IPMI Management Utilities
Summary(pl.UTF-8): Narzędzia zarządzające IPMI
Name: ipmiutil
-Version: 2.2.0
-Release: 2
+Version: 2.2.4
+Release: 1
%if %{with gpl}
License: GPL
%else
@@ -12,7 +12,7 @@
%endif
Group: Applications/System
Source0: http://dl.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5: 382be2356375081e777b3b6e4d51afe0
+# Source0-md5: 64be42e4d532cac0b27e478723e999f2
Patch0: %{name}-am.patch
Patch1: %{name}-make-jN.patch
Patch2: %{name}-am2.patch
@@ -101,7 +101,7 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO doc/UserGuide doc/checksel
+%doc AUTHORS COPYING ChangeLog NEWS README TODO doc/UserGuide doc/checksel doc/*.sh
%attr(755,root,root) %{_sbindir}/alarms
%attr(755,root,root) %{_sbindir}/bmcconfig
%attr(755,root,root) %{_sbindir}/bmchealth
@@ -146,6 +146,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2010/01/05 14:33:10 gotar
+- upgraded to 2.2.4
+
Revision 1.16 2008/11/13 12:53:45 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-am2.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-make-jN.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil.spec?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list