From ff12a786d1a567988cb18cf1d104ec38425c8cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Thu, 20 May 2010 13:56:32 +0000 Subject: [PATCH] updated to OpenIPMI-2.0.18 fixed OpenIPMIpthread pkgconfig file Resolves: #468067 --- .cvsignore | 2 +- OpenIPMI-2.0.18-pthread-pkgconfig.patch | 18 ++++++++++++++++++ OpenIPMI.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 OpenIPMI-2.0.18-pthread-pkgconfig.patch diff --git a/.cvsignore b/.cvsignore index b1101d4..92ad568 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -OpenIPMI-2.0.17.tar.gz +OpenIPMI-2.0.18.tar.gz diff --git a/OpenIPMI-2.0.18-pthread-pkgconfig.patch b/OpenIPMI-2.0.18-pthread-pkgconfig.patch new file mode 100644 index 0000000..9a76208 --- /dev/null +++ b/OpenIPMI-2.0.18-pthread-pkgconfig.patch @@ -0,0 +1,18 @@ +468067 - "pkg-config --libs OpenIPMIpthread" fails + +Fix the pkgconfig file. + +Reported upstream as http://sourceforge.net/tracker/index.php?func=detail&aid=2188750&group_id=36127&atid=416301 + +diff -up OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig OpenIPMI-2.0.18/OpenIPMIpthread.pc.in +--- OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 ++++ OpenIPMI-2.0.18/OpenIPMIpthread.pc.in 2010-05-20 15:48:07.000000000 +0200 +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: OpenIPMIpthread + Description: Pthread OS handler for OpenIPMI + Version: @VERSION@ +-Requires: OpenIPMI pthread ++Requires: OpenIPMI + Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread +-Cflags: -I${includedir} ++Cflags: -I${includedir} -pthread diff --git a/OpenIPMI.spec b/OpenIPMI.spec index ba39e4e..020418b 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI -Version: 2.0.17 +Version: 2.0.18 Release: 1%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base @@ -20,6 +20,8 @@ BuildRequires: desktop-file-utils Requires(post): chkconfig Requires(preun): chkconfig +Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch + %description The Open IPMI project aims to develop an open code base to allow access to platform information using Intelligent Platform Management Interface (IPMI). @@ -70,6 +72,7 @@ and control IPMI-enabled devices. %prep %setup -q +%patch1 -p1 %build export CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -78,7 +81,6 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -rm -f swig/python/OpenIPMI_wrap.c make # not %{?_smp_mflags} safe %install @@ -165,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/fedora-openipmigui.desktop %changelog +* Wed May 5 2010 Jan Safranek - 2.0.18-1 +- updated to OpenIPMI-2.0.18 +- fixed OpenIPMIpthread pkgconfig file (#468067) + * Mon May 3 2010 Jan Safranek - 2.0.17-1 - updated to OpenIPMI-2.0.17 diff --git a/sources b/sources index dad4458..8451ba1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9e95c161e2c649ad8e2f813acd2fc33 OpenIPMI-2.0.17.tar.gz +8392539200fbda670503770292dfbb8f OpenIPMI-2.0.18.tar.gz