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

diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index c3f0722..91d5842 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -1,8 +1,3 @@
-# TODO
-# - bad BR (version mismatch):
-#  File "_mc_user.py", line 240, in ?
-#    class MCUsers(gui_treelist.TreeList): AttributeError: 'module' object has no attribute 'TreeList'
-#  make[4]: *** [_entity.pyc] Error 1
 #
 # Conditional build:
 %bcond_without	gui	# don't build tkinter-based GUI
@@ -10,16 +5,18 @@
 Summary:	IPMI abstraction layer
 Summary(pl.UTF-8):	Warstwa abstrakcji IPMI
 Name:		OpenIPMI
-Version:	2.0.10
-Release:	2
-License:	LGPL (library), GPL (ipmicmd)
+Version:	2.0.22
+Release:	3
+License:	LGPL v2+ (library), GPL v2+ (ipmicmd)
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-# Source0-md5:	8f5c200c5f25c33250567eaeb685e8c0
+Source0:	http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
+# Source0-md5:	9a4e1f6bb073379c494839201ea10aee
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-python.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
@@ -27,6 +24,7 @@ BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	ncurses-devel
 BuildRequires:	net-snmp-devel
+BuildRequires:	openssl-devel
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
@@ -38,6 +36,10 @@ BuildRequires:	swig-perl >= 1.3.25
 BuildRequires:	swig-python >= 1.3.25
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# 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
 platform information using Intelligent Platform Management Interface
@@ -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
@@ -115,28 +117,32 @@ Graficzny interfejs użytkownika do OpenIPMI.
 %setup -q
 %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}
-%{__make} \
-	PYTHON_INSTALL_DIR=%{py_sitedir}
+%{__make} %{?with_gui:-j1}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install -j1 \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PYTHON_INSTALL_DIR=%{py_sitedir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{py,la,a} \
-	$RPM_BUILD_ROOT%{py_sitedir}/openipmigui/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} \
+	$RPM_BUILD_ROOT%{py_sitescriptdir}/*.py \
+	%{?with_gui:$RPM_BUILD_ROOT%{py_sitescriptdir}/openipmigui/*.py}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,25 +152,93 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog FAQ README* TODO
-%attr(755,root,root) %{_bindir}/ipmi*
+%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}/lib*.so.*.*.*
-%{_mandir}/man[178]/*
+%attr(755,root,root) %{_libdir}/libIPMIlanserv.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libIPMIlanserv.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMI.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMI.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMIcmdlang.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMIcmdlang.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMIglib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMIglib.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMIposix.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMIposix.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMIpthread.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMIpthread.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMItcl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenIPMItcl.so.0
+%attr(755,root,root) %{_libdir}/libOpenIPMIui.so.*.*.*
+%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*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libIPMIlanserv.so
+%attr(755,root,root) %{_libdir}/libOpenIPMI.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIcmdlang.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIglib.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIposix.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIpthread.so
+%attr(755,root,root) %{_libdir}/libOpenIPMItcl.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIui.so
+%attr(755,root,root) %{_libdir}/libOpenIPMIutils.so
+%{_libdir}/libIPMIlanserv.la
+%{_libdir}/libOpenIPMI.la
+%{_libdir}/libOpenIPMIcmdlang.la
+%{_libdir}/libOpenIPMIglib.la
+%{_libdir}/libOpenIPMIposix.la
+%{_libdir}/libOpenIPMIpthread.la
+%{_libdir}/libOpenIPMItcl.la
+%{_libdir}/libOpenIPMIui.la
+%{_libdir}/libOpenIPMIutils.la
 %{_includedir}/%{name}
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/OpenIPMI.pc
+%{_pkgconfigdir}/OpenIPMIcmdlang.pc
+%{_pkgconfigdir}/OpenIPMIglib.pc
+%{_pkgconfigdir}/OpenIPMIposix.pc
+%{_pkgconfigdir}/OpenIPMIpthread.pc
+%{_pkgconfigdir}/OpenIPMItcl.pc
+%{_pkgconfigdir}/OpenIPMIui.pc
+%{_pkgconfigdir}/OpenIPMIutils.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libIPMIlanserv.a
+%{_libdir}/libOpenIPMI.a
+%{_libdir}/libOpenIPMIcmdlang.a
+%{_libdir}/libOpenIPMIglib.a
+%{_libdir}/libOpenIPMIposix.a
+%{_libdir}/libOpenIPMIpthread.a
+%{_libdir}/libOpenIPMItcl.a
+%{_libdir}/libOpenIPMIui.a
+%{_libdir}/libOpenIPMIutils.a
 
 %files -n perl-%{name}
 %defattr(644,root,root,755)
@@ -175,13 +249,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_OpenIPMI.so
-%{py_sitedir}/OpenIPMI.py[co]
+%{py_sitescriptdir}/OpenIPMI.py[co]
 
 %if %{with gui}
 %files gui
 %defattr(644,root,root,755)
 %doc swig/python/openipmigui/TODO
 %attr(755,root,root) %{_bindir}/openipmigui
-%dir %{py_sitedir}/openipmigui
-%{py_sitedir}/openipmigui/*.py[co]
+%dir %{py_sitescriptdir}/openipmigui
+%{py_sitescriptdir}/openipmigui/*.py[co]
+%{_mandir}/man1/openipmigui.1*
 %endif