packages: openhpi/openhpi-c++.patch, openhpi/openhpi.spec, openhpi/openhpi-...

Sat Jan 15 12:57:04 CET 2011

Author: qboosh                       Date: Sat Jan 15 11:57:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.14.1
- added one more fix to c++ patch
- added install patch to use PLD-compliant init.d dir; package init script
- separated -libs

---- Files affected:
packages/openhpi:
   openhpi-c++.patch (1.1 -> 1.2) , openhpi.spec (1.42 -> 1.43) , openhpi-install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openhpi/openhpi-c++.patch
diff -u packages/openhpi/openhpi-c++.patch:1.1 packages/openhpi/openhpi-c++.patch:1.2

--- packages/openhpi/openhpi-c++.patch:1.1	Sun Nov  4 01:33:12 2007
+++ packages/openhpi/openhpi-c++.patch	Sat Jan 15 12:56:58 2011
@@ -4921,3 +4921,14 @@
 +	return false;
 +}
 +
+--- openhpi-2.14.1/plugins/ipmidirect/ipmi_mc_vendor.cpp.orig	2009-11-23 21:18:08.000000000 +0100
++++ openhpi-2.14.1/plugins/ipmidirect/ipmi_mc_vendor.cpp	2011-01-15 10:13:51.918365808 +0100
+@@ -931,7 +931,7 @@
+           /* Everything is valid, create the Watchdog RDR */
+           stdlog << "CreateWatchdogs Resource type " << res->EntityPath().GetEntryType(0) << " instance " << res->EntityPath().GetEntryInstance(0) << "\n";
+         
+-          cIpmiRdr *wd = new cIpmiWatchdog::cIpmiWatchdog( mc, SAHPI_DEFAULT_WATCHDOG_NUM, 0 );
++          cIpmiRdr *wd = new cIpmiWatchdog( mc, SAHPI_DEFAULT_WATCHDOG_NUM, 0 );
+         
+           wd->EntityPath() = res->EntityPath();
+         

================================================================
Index: packages/openhpi/openhpi.spec
diff -u packages/openhpi/openhpi.spec:1.42 packages/openhpi/openhpi.spec:1.43
--- packages/openhpi/openhpi.spec:1.42	Sun Jun  6 15:37:53 2010
+++ packages/openhpi/openhpi.spec	Sat Jan 15 12:56:58 2011
@@ -1,19 +1,21 @@
 # $Revision$, $Date$
+# TODO: PLDify init script
 Summary:	Service Availability Forum's Hardware Platform Interface (HPI) implementation
 Summary(pl.UTF-8):	Implementacja HPI (Hardware Platform Interface) Service Availability Forum
 Name:		openhpi
-Version:	2.12.0
-Release:	3
+Version:	2.14.1
+Release:	1
 License:	BSD
-Group:		Libraries
-Source0:	http://dl.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
-# Source0-md5:	56c4d444cad0c9d471acdbbec384b81c
+Group:		Applications/System
+Source0:	http://downloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
+# Source0-md5:	1533972a05f2ed61f3ae441ecd3df5a9
 Patch0:		%{name}-types.patch
 Patch1:		%{name}-sh.patch
 Patch2:		%{name}-align.patch
 Patch3:		%{name}-proto.patch
 Patch4:		%{name}-rtas.patch
 Patch5:		%{name}-c++.patch
+Patch6:		%{name}-install.patch
 URL:		http://www.openhpi.org/
 BuildRequires:	OpenIPMI-devel >= 1.4.20
 BuildRequires:	autoconf >= 2.57
@@ -35,7 +37,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sysfsutils-devel >= 1.3.0-3
-Requires:	glib2 >= 1:2.2.0
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -56,11 +58,24 @@
 w ramach i szafach, ale rozszerzalny dla innego rodzaju problemów,
 takich jak klastrowanie, wirtualizacja czy symulacja.
 
+%package libs
+Summary:	OpenHPI Toolkit libraries
+Summary(pl.UTF-8):	Biblioteki OpenHPI
+Group:		Libraries
+Requires:	glib2 >= 1:2.2.0
+Conflicts:	openhpi < 2.14.1
+
+%description libs
+OpenHPI Toolkit libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki OpenHPI.
+
 %package devel
 Summary:	Development part of OpenHPI Toolkit library
 Summary(pl.UTF-8):	Programistyczna część biblioteki OpenHPI
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.2.0
 Requires:	libltdl-devel
 # for libosahpi
@@ -167,6 +182,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -177,7 +193,6 @@
 %configure \
 	--enable-cpp_wrappers \
 	--enable-daemon \
-	--enable-dummy \
 %ifarch ppc ppc64
 	--enable-rtas \
 %endif
@@ -185,8 +200,6 @@
 
 %{__make}
 
-%{__make} -C docs/hld openhpi-manual/book1.html
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -194,27 +207,19 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # remove useless static plugins (but *.la are used by lt_dlopen)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README docs/hld/openhpi-manual
+%doc COPYING README README.daemon docs/hld/openhpi-manual
 %attr(755,root,root) %{_bindir}/hpi*
 %attr(755,root,root) %{_sbindir}/openhpid
-%attr(755,root,root) %{_libdir}/libohtcpconnx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libohtcpconnx.so.2
-%attr(755,root,root) %{_libdir}/libohudpconnx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libohudpconnx.so.2
-%attr(755,root,root) %{_libdir}/libopenhpi*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopenhpi*.so.2
-%attr(755,root,root) %{_libdir}/libosahpi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libosahpi.so.2
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libilo2_ribcl.so*
 %{_libdir}/%{name}/libilo2_ribcl.la
@@ -224,11 +229,24 @@
 %{_libdir}/%{name}/libwatchdog.la
 %dir %{_sysconfdir}/openhpi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openhpi/openhpi.conf
-#%attr(754,root,root) /etc/rc.d/init.d/openhpid
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openhpi/openhpiclient.conf
+%attr(754,root,root) /etc/rc.d/init.d/openhpid
 %dir %{_localstatedir}/lib/%{name}
+%{_mandir}/man1/hpi*.1*
 %{_mandir}/man7/openhpi.7*
 %{_mandir}/man8/openhpid.8*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libohtcpconnx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libohtcpconnx.so.2
+%attr(755,root,root) %{_libdir}/libohudpconnx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libohudpconnx.so.2
+%attr(755,root,root) %{_libdir}/libopenhpi*.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopenhpi*.so.2
+%attr(755,root,root) %{_libdir}/libosahpi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libosahpi.so.2
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libohtcpconnx.so
@@ -290,6 +308,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2011/01/15 11:56:58  qboosh
+- updated to 2.14.1
+- added one more fix to c++ patch
+- added install patch to use PLD-compliant init.d dir; package init script
+- separated -libs
+
 Revision 1.42  2010/06/06 13:37:53  arekm
 - release 3
 

================================================================
Index: packages/openhpi/openhpi-install.patch
diff -u /dev/null packages/openhpi/openhpi-install.patch:1.1
--- /dev/null	Sat Jan 15 12:57:04 2011
+++ packages/openhpi/openhpi-install.patch	Sat Jan 15 12:56:58 2011
@@ -0,0 +1,15 @@
+--- openhpi-2.14.1/openhpid/Makefile.am.orig	2009-11-23 21:19:38.000000000 +0100
++++ openhpi-2.14.1/openhpid/Makefile.am	2011-01-15 11:00:55.598363293 +0100
+@@ -55,9 +55,10 @@
+                         $(top_builddir)/marshal/libopenhpimarshal.la \
+                         $(top_builddir)/utils/libopenhpiutils.la
+ 
++initddir=$(sysconfdir)/rc.d/init.d
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/init.d
+-	$(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(sysconfdir)/init.d/openhpid
++	$(mkinstalldirs) $(DESTDIR)$(initddir)
++	$(INSTALL) -m 0755 openhpid.sh $(DESTDIR)$(initddir)/openhpid
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(sysconfdir)/init.d/openhpid
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openhpi/openhpi-c++.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openhpi/openhpi.spec?r1=1.42&r2=1.43&f=u

