From 8b2a57e3773c241ccd352a0e775bff8a2014b5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Tue, 29 Sep 2009 16:13:27 +0000 Subject: [PATCH 1/6] Initialize branch F-12 for OpenIPMI --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From a5fcd8e00ceb259f5432fbfd464149d6781e686e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:19:42 +0000 Subject: [PATCH 2/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6d58452..90accd0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d98da6bb36e06b3f53a411eefbbf8749fb9640b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Tue, 1 Dec 2009 11:26:55 +0000 Subject: [PATCH 3/6] fix rpmlint errors --- OpenIPMI.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 06ea473..c7871bb 100644 --- a/OpenIPMI.spec +++ b/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: 5%{?dist} License: BSD and BSD with advertising and LGPLv2+ and GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -84,11 +84,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 +160,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/fedora-openipmigui.desktop %changelog +* Tue Dec 1 2009 Jan Safranek - 2.0.16-5 +- fix rpmlint errors + * Fri Aug 21 2009 Tomas Mraz - 2.0.16-4 - rebuilt with new openssl From 97cfb08b782a9c0e6c78ba9a0cdc140f93486d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Wed, 2 Jun 2010 07:51:04 +0000 Subject: [PATCH 4/6] fixed OpenIPMIpthread pkgconfig file Resolves: #598546 --- OpenIPMI.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c7871bb..6ba1e93 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 2.0.16 -Release: 5%{?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" @@ -160,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/fedora-openipmigui.desktop %changelog +* Wed Jun 2 2010 Jan Safranek - 2.0.16-6 +- fixed OpenIPMIpthread pkgconfig file (#598546) + * Tue Dec 1 2009 Jan Safranek - 2.0.16-5 - fix rpmlint errors From d03c02576ab8f695c3373b03120ba2f192a2f4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Wed, 2 Jun 2010 07:52:20 +0000 Subject: [PATCH 5/6] fixed OpenIPMIpthread pkgconfig file Resolves: #598551 --- OpenIPMI-2.0.18-pthread-pkgconfig.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 OpenIPMI-2.0.18-pthread-pkgconfig.patch 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 From 6b1fca874509d0138a2a97c1f33587c4ddaddc08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:08:29 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 90accd0..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12