- x32 rebuild

[packages/OpenIPMI.git] / OpenIPMI.spec

diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index 043657ada043ad12e4455519409f4c061d70df2b..5b87fa8d3cb3bea0fd97fd4cc921eb811cb11560 100644 (file)
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -5,14 +5,16 @@
 Summary:       IPMI abstraction layer
 Summary(pl.UTF-8):     Warstwa abstrakcji IPMI
 Name:          OpenIPMI
-Version:       2.0.13
-Release:       2
+Version:       2.0.19
+Release:       9
 License:       LGPL v2+ (library), GPL v2+ (ipmicmd)
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-# Source0-md5: 41835d4a2db684b9fca66e954c18c348
+Source0:       http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
+# Source0-md5: e96e68b972d4b376f239d32cd3629328
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-python.patch
+Patch1:                %{name}-popt.patch
+Patch2:                %{name}-pthread.patch
+Patch3:                avoid-echo-e.patch
 URL:           http://openipmi.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -22,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
@@ -33,6 +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\..*
+
 %description
 OpenIPMI project aims to develop an open code base to allow access to
 platform information using Intelligent Platform Management Interface
@@ -90,7 +96,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
@@ -110,6 +116,8 @@ Graficzny interfejs użytkownika do OpenIPMI.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -121,7 +129,7 @@ CPPFLAGS="-I/usr/include/ncurses"
        --with-pythoninstalllib=%{py_sitedir} \
        --without-glib12 \
        %{!?with_gui:--without-tkinter}
-%{__make}
+%{__make} %{?with_gui:-j1}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -129,9 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} \
+%{__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
@@ -141,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog FAQ README* TODO
+%doc CONFIGURING_FOR_LAN ChangeLog FAQ README* TODO
 %attr(755,root,root) %{_bindir}/ipmi_ui
 %attr(755,root,root) %{_bindir}/ipmicmd
 %attr(755,root,root) %{_bindir}/ipmilan
@@ -151,9 +159,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rmcp_ping
 %attr(755,root,root) %{_bindir}/solterm
 %attr(755,root,root) %{_libdir}/libIPMIlanserv.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOpenIPMI*.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libIPMIlanserv.so.0
-%attr(755,root,root) %ghost %{_libdir}/libOpenIPMI*.so.[0-9]
+%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
 %{_mandir}/man1/ipmi_ui.1*
 %{_mandir}/man1/openipmicmd.1*
 %{_mandir}/man1/openipmish.1*
@@ -166,16 +188,44 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libIPMIlanserv.so
-%attr(755,root,root) %{_libdir}/libOpenIPMI*.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}/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}/libIPMIlanserv.a
-%{_libdir}/libOpenIPMI*.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)