dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: OpenIPMI
-# $Id$
-NAME := OpenIPMI
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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

OpenIPMI.spec

@@ -4,7 +4,7 @@
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.16
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -19,6 +19,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).
@@ -69,6 +71,7 @@ and control IPMI-enabled devices.
 
 %prep
 %setup -q
+%patch1 -p1 -b .pthread-pkgconfig
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -84,11 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-# Remove python cruft in 32bit libdir on 64bit archs...
-%ifarch ppc64 s390x x86_64
-rm -rf $RPM_BUILD_ROOT/usr/lib
-%endif
-
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
 install -d ${RPM_BUILD_ROOT}%{_initrddir}
@@ -165,6 +163,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Wed Jun  2 2010 Jan Safranek <jsafrane@redhat.com> - 2.0.16-6
+- fixed OpenIPMIpthread pkgconfig file (#598546)
+
+* Tue Dec  1 2009 Jan Safranek <jsafrane@redhat.com> - 2.0.16-5
+- fix rpmlint errors
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.16-4
 - rebuilt with new openssl