X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=OpenIPMI.spec;h=91d58421cda1fdcaa5abb462bd7f5510395af17b;hb=e1f7d6f6249a5477c47e92bccb0cd06e328c7150;hp=f6131b7132ab24199de69447e4f024c7bcd5aa3e;hpb=115ed3f3cbc111dd2f59e7c81c486f73a3c9b02a;p=packages%2FOpenIPMI.git

diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index f6131b7..91d5842 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -5,17 +5,18 @@
 Summary:	IPMI abstraction layer
 Summary(pl.UTF-8):	Warstwa abstrakcji IPMI
 Name:		OpenIPMI
-Version:	2.0.18
-Release:	8
+Version:	2.0.22
+Release:	3
 License:	LGPL v2+ (library), GPL v2+ (ipmicmd)
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-# Source0-md5:	8392539200fbda670503770292dfbb8f
+# Source0-md5:	9a4e1f6bb073379c494839201ea10aee
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-popt.patch
-Patch2:		%{name}-pthread.patch
+Patch1:		%{name}-pthread.patch
+Patch2:		avoid-echo-e.patch
+Patch3:		%{name}-missing.patch
 URL:		http://openipmi.sourceforge.net/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	gdbm-devel
@@ -35,8 +36,9 @@ BuildRequires:	swig-perl >= 1.3.25
 BuildRequires:	swig-python >= 1.3.25
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# refers to global ipmi_cmdlang_{global_err,report_event} symbols
-%define		skip_post_check_so	libOpenIPMIcmdlang\.so\..*
+# libOpenIPMIcmdlang refers to global ipmi_cmdlang_{global_err,report_event} symbols
+# libIPMIlanserv uses symbols from binaries (ipmilan, ipmi_sim)
+%define		skip_post_check_so	libOpenIPMIcmdlang\.so\..* libIPMIlanserv\.so\..*
 
 %description
 OpenIPMI project aims to develop an open code base to allow access to
@@ -95,7 +97,7 @@ Requires:	%{name} = %{version}-%{release}
 %description -n python-%{name}
 Python interface to OpenIPMI.
 
-%description -n perl-%{name} -l pl.UTF-8
+%description -n python-%{name} -l pl.UTF-8
 Pythonowy interfejs do OpenIPMI.
 
 %package gui
@@ -116,14 +118,17 @@ Graficzny interfejs użytkownika do OpenIPMI.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-CPPFLAGS="-I/usr/include/ncurses"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 %configure \
+	--with-pythoninstall=%{py_sitescriptdir} \
 	--with-pythoninstalllib=%{py_sitedir} \
 	--without-glib12 \
 	%{!?with_gui:--without-tkinter}
@@ -137,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} \
 	$RPM_BUILD_ROOT%{py_sitescriptdir}/*.py \
-	$RPM_BUILD_ROOT%{py_sitescriptdir}/openipmigui/*.py
+	%{?with_gui:$RPM_BUILD_ROOT%{py_sitescriptdir}/openipmigui/*.py}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,13 +153,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CONFIGURING_FOR_LAN ChangeLog FAQ README* TODO
+%attr(755,root,root) %{_bindir}/ipmi_sim
 %attr(755,root,root) %{_bindir}/ipmi_ui
 %attr(755,root,root) %{_bindir}/ipmicmd
 %attr(755,root,root) %{_bindir}/ipmilan
 %attr(755,root,root) %{_bindir}/ipmish
+%attr(755,root,root) %{_bindir}/openipmi_eventd
 %attr(755,root,root) %{_bindir}/openipmicmd
 %attr(755,root,root) %{_bindir}/openipmish
 %attr(755,root,root) %{_bindir}/rmcp_ping
+%attr(755,root,root) %{_bindir}/sdrcomp
 %attr(755,root,root) %{_bindir}/solterm
 %attr(755,root,root) %{_libdir}/libIPMIlanserv.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libIPMIlanserv.so.0
@@ -174,11 +182,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libOpenIPMIui.so.1
 %attr(755,root,root) %{_libdir}/libOpenIPMIutils.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libOpenIPMIutils.so.0
+%dir %{_sysconfdir}/ipmi
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ipmi/ipmisim1.emu
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ipmi/lan.conf
+%{_mandir}/man1/ipmi_sim.1*
 %{_mandir}/man1/ipmi_ui.1*
+%{_mandir}/man1/openipmi_eventd.1*
 %{_mandir}/man1/openipmicmd.1*
 %{_mandir}/man1/openipmish.1*
 %{_mandir}/man1/rmcp_ping.1*
 %{_mandir}/man1/solterm.1*
+%{_mandir}/man5/ipmi_lan.5*
+%{_mandir}/man5/ipmi_sim_cmd.5*
 %{_mandir}/man7/ipmi_cmdlang.7*
 %{_mandir}/man7/openipmi_conparms.7*
 %{_mandir}/man8/ipmilan.8*