diff --git a/adapt_to_suse_docdir.patch b/adapt_to_suse_docdir.patch index 500c875..22263e9 100644 --- a/adapt_to_suse_docdir.patch +++ b/adapt_to_suse_docdir.patch @@ -1,24 +1,70 @@ -diff -wruN ../orig-freeipmi-0.8.2/doc/Makefile.am ./doc/Makefile.am ---- ../orig-freeipmi-0.8.2/doc/Makefile.am 2009-12-16 19:40:08.000000000 +0100 -+++ ./doc/Makefile.am 2010-01-14 12:09:41.000000000 +0100 -@@ -12,7 +12,7 @@ - freeipmi-bugs-issues-and-workarounds.txt \ - freeipmi-oem-documentation-requirements.txt +From: Thomas Renninger +Subject: Do not override docdir + +./configure --docdir= +does not work. Simply removing the override +makes it use the default docdir. +Also use $docdir in subfolders. + +--- + Makefile.am | 1 - + contrib/Makefile.am | 8 ++++---- + doc/Makefile.am | 2 -- + 3 files changed, 4 insertions(+), 7 deletions(-) + +Index: contrib/Makefile.am +=================================================================== +--- contrib/Makefile.am.orig ++++ contrib/Makefile.am +@@ -1,22 +1,22 @@ +-ganglia_docdir = $(datadir)/doc/$(PACKAGE)/contrib/ganglia ++ganglia_docdir = $(docdir)/contrib/ganglia --docdir = $(datadir)/doc/$(PACKAGE) -+docdir = $(datadir)/doc/packages/$(PACKAGE) + ganglia_doc_DATA = \ + ganglia/README \ + ganglia/ganglia_ipmi_sensors.pl - doc_DATA = $(EXTRA_DIST) +-libipmimonitoring_docdir = $(datadir)/doc/$(PACKAGE)/contrib/libipmimonitoring ++libipmimonitoring_docdir = $(docdir)/contrib/libipmimonitoring -diff -wruN ../orig-freeipmi-0.8.2/Makefile.am ./Makefile.am ---- ../orig-freeipmi-0.8.2/Makefile.am 2009-06-18 18:50:59.000000000 +0200 -+++ ./Makefile.am 2010-01-14 15:30:07.000000000 +0100 -@@ -74,7 +74,7 @@ + libipmimonitoring_doc_DATA = \ + libipmimonitoring/ipmimonitoring-sel.c \ + libipmimonitoring/ipmimonitoring-sensors.c + +-nagios_docdir = $(datadir)/doc/$(PACKAGE)/contrib/nagios ++nagios_docdir = $(docdir)/contrib/nagios + + nagios_doc_DATA = \ + nagios/README \ + nagios/nagios_ipmi_sensors.pl + +-pet_docdir = $(datadir)/doc/$(PACKAGE)/contrib/pet ++pet_docdir = $(docdir)/contrib/pet + + pet_doc_DATA = \ + pet/README \ +Index: Makefile.am +=================================================================== +--- Makefile.am.orig ++++ Makefile.am +@@ -79,7 +79,6 @@ EXTRA = \ DISCLAIMER.ipmidetect.UC \ DISCLAIMER.ipmi-fru.UC -docdir = $(datadir)/doc/$(PACKAGE) -+docdir = $(datadir)/doc/packages/$(PACKAGE) doc_DATA = $(EXTRA) CLEANFILES = +Index: doc/Makefile.am +=================================================================== +--- doc/Makefile.am.orig ++++ doc/Makefile.am +@@ -13,8 +13,6 @@ EXTRA_DIST = \ + freeipmi-bugs-issues-and-workarounds.txt \ + freeipmi-oem-documentation-requirements.txt + +-docdir = $(datadir)/doc/$(PACKAGE) +- + doc_DATA = $(EXTRA_DIST) + + diff --git a/add_default_start.patch b/add_default_start.patch index 14fad3c..2f452ac 100644 --- a/add_default_start.patch +++ b/add_default_start.patch @@ -1,6 +1,6 @@ -diff -wruN -x '*~' ../orig-freeipmi-1.0.3/ipmidetectd/ipmidetectd.init ./ipmidetectd/ipmidetectd.init ---- ../orig-freeipmi-1.0.3/ipmidetectd/ipmidetectd.init 2011-03-30 00:25:12.000000000 +0200 -+++ ./ipmidetectd/ipmidetectd.init 2011-03-30 10:02:16.000000000 +0200 +diff -wruN -x '*~' ../orig-freeipmi-1.0.3/etc/ipmidetectd.init ./etc/ipmidetectd.init +--- ../orig-freeipmi-1.0.3/etc/ipmidetectd.init 2011-03-30 00:25:12.000000000 +0200 ++++ ./etc/ipmidetectd.init 2011-03-30 10:02:16.000000000 +0200 @@ -8,6 +8,7 @@ # Provides: ipmidetectd # Required-Start: $network $remote_fs $syslog diff --git a/freeipmi-1.0.6.tar.bz2 b/freeipmi-1.0.6.tar.bz2 deleted file mode 100644 index 7908af6..0000000 --- a/freeipmi-1.0.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c29d156dfc2214d879dc24cdb9f72f0ef445913ea8203a87dcc7303b6dfbd27e -size 2072445 diff --git a/freeipmi-1.1.2.tar.bz2 b/freeipmi-1.1.2.tar.bz2 new file mode 100644 index 0000000..e700846 --- /dev/null +++ b/freeipmi-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bb0a9eac9c720337000c588ee34d4d961f13299f90124f4192cbdc4cc2484e9 +size 2236615 diff --git a/freeipmi.changes b/freeipmi.changes index d6a07c5..589e63a 100644 --- a/freeipmi.changes +++ b/freeipmi.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 6 16:11:04 UTC 2012 - trenn@suse.de + +- Update to 1.1.2 +- Adjusted license to GPL-3.0 +- Silent some build checks: + - license string + - too short description + - remove INSTALL file from %docdir + ------------------------------------------------------------------- Wed Sep 21 09:05:12 UTC 2011 - kkaempf@suse.com diff --git a/freeipmi.spec b/freeipmi.spec index 8208158..b0973dd 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -3,7 +3,7 @@ # %define name freeipmi -%define version 1.0.6 +%define version 1.1.2 %if %{?_with_debug:1}%{!?_with_debug:0} %define release 1.debug%{?dist} %else @@ -13,7 +13,7 @@ Name: %{name} Version: %{version} Release: %{release} -License: GPLv2+ +License: GPL-3.0+ Group: Applications/System URL: http://www.gnu.org/software/freeipmi/ Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.bz2 @@ -23,7 +23,7 @@ Patch2: adapt_to_suse_docdir.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgcrypt-devel texinfo +BuildRequires: libgcrypt-devel texinfo automake libtool pkg-config Requires(post): info Requires(preun): info Obsoletes: freeipmi-ipmimonitoring @@ -31,7 +31,7 @@ Obsoletes: freeipmi-ipmimonitoring ExclusiveArch: %{ix86} x86_64 ia64 alpha Summary: FreeIPMI %description -The FreeIPMI project provides "Remote-Console" (out-of-band) and +This project provides "Remote-Console" (out-of-band) and "System Management Software" (in-band) based on Intelligent Platform Management Interface specification. @@ -67,7 +67,7 @@ Requires(post): chkconfig Requires(preun): chkconfig %endif %description ipmidetectd -IPMI node detection daemon. +This service detects and monitors IPMI nodes. %if %{?_with_debug:1}%{!?_with_debug:0} %define _enable_debug --enable-debug --enable-trace @@ -87,6 +87,7 @@ libtoolize --force --automake --copy automake --gnu --include-deps --copy --add-missing autoconf %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ + --docdir=%{_docdir}/%name \ %{?_enable_debug} --disable-static CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -104,6 +105,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_initrddir} DESTDIR="$RPM_BUILD_ROOT" make install +# Silent build check warning +rm $RPM_BUILD_ROOT/usr/share/doc/packages/freeipmi/INSTALL + %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} # remove /etc/init.d -> /etc/rc.d/init.d (cd $RPM_BUILD_ROOT/%{_sysconfdir}; rm init.d) @@ -209,15 +213,15 @@ fi # %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/ipmi_monitoring_sensors.conf %config(noreplace) %{_sysconfdir}/freeipmi/freeipmi.conf %dir %{_sysconfdir}/freeipmi -%{_sysconfdir}/freeipmi/freeipmi_interpret_sel.conf -%{_sysconfdir}/freeipmi/freeipmi_interpret_sensor.conf -%{_sysconfdir}/freeipmi/ipmidetect.conf -%{_sysconfdir}/freeipmi/libipmiconsole.conf +%config %{_sysconfdir}/freeipmi/freeipmi_interpret_sel.conf +%config %{_sysconfdir}/freeipmi/freeipmi_interpret_sensor.conf +%config %{_sysconfdir}/freeipmi/ipmidetect.conf +%config %{_sysconfdir}/freeipmi/libipmiconsole.conf %doc AUTHORS %doc COPYING %doc ChangeLog %doc ChangeLog.0 -%doc INSTALL +# doc INSTALL %doc NEWS %doc README %doc TODO @@ -283,6 +287,7 @@ fi %{_sbindir}/ipmi-power %{_sbindir}/rmcp-ping %{_sbindir}/rmcpping +%{_sbindir}/ipmi-pet %{_mandir}/man8/bmc-config.8* %{_mandir}/man5/bmc-config.conf.5* %{_mandir}/man8/bmc-info.8* @@ -322,6 +327,7 @@ fi %{_mandir}/man8/ipmi-detect.8* %{_mandir}/man8/ipmi-ping.8* %{_mandir}/man8/ipmi-power.8* +%{_mandir}/man8/ipmi-pet.8* %dir %{_localstatedir}/cache/ipmimonitoringsdrcache %files devel