rpms/openhpi/devel openhpi-2.10.2-initd.patch, NONE, 1.1 openhpi-2.10.2-marshal.patch, NONE, 1.1 openhpi-2.10.2-snmp_bc-sessionid.patch, NONE, 1.1 openhpi-2.10.2-tests.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 openhpi-2.10.1-gcc43.patch, 1.1, 1.2 openhpi.spec, 1.62, 1.63 sources, 1.10, 1.11 openhpi-2.8.1-segfault.patch, 1.1, NONE openhpi-2.8.1-snmp_bc_discover.patch, 1.1, NONE

Dan Horak (sharkcz) fedora-extras-commits at redhat.com
Fri Apr 11 13:31:38 UTC 2008


Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19483

Modified Files:
	.cvsignore openhpi-2.10.1-gcc43.patch openhpi.spec sources 
Added Files:
	openhpi-2.10.2-initd.patch openhpi-2.10.2-marshal.patch 
	openhpi-2.10.2-snmp_bc-sessionid.patch 
	openhpi-2.10.2-tests.patch 
Removed Files:
	openhpi-2.8.1-segfault.patch 
	openhpi-2.8.1-snmp_bc_discover.patch 
Log Message:
* Thu Mar 13 2008 Dan Horak <dan[at]danny.cz> - 2.10.2-1
- update to 2.10.2
- spec file and patch cleanup


openhpi-2.10.2-initd.patch:

--- NEW FILE openhpi-2.10.2-initd.patch ---
Index: openhpid/openhpid.sh.in
===================================================================
--- openhpid/openhpid.sh.in	(revision 6763)
+++ openhpid/openhpid.sh.in	(working copy)
@@ -12,6 +12,18 @@
 # Author(s):
 #	W. David Ashley <dashley at us.ibm.com>
 #	Daniel de Araujo <ddearauj at us.ibm.com>
+#
+### BEGIN INIT INFO
+# Provides:          openhpid
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      $named
+# Should-Stop:       $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start OpenHPI daemon at boot time
+# Description:       Enable OpenHPI service which is provided by openhpid.
+### END INIT INFO
 
 # Source function library.
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -97,6 +109,8 @@
 	esac
         
 	print_outcome
+        
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openhpid
 
 }
 
@@ -124,11 +138,7 @@
 	
 	print_outcome
 	
-	if test "$RETVAL" -eq 0 && test -f /var/run/openhpid.pid
-	then
-		rm -f /var/lock/openhpid
-		rm -f /var/run/openhpid.pid
-	fi	
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/openhpid
 
 }	
 
@@ -176,6 +186,10 @@
 	start
 }	
 
+condrestart() {
+	[ -f /var/lock/subsys/openhpid ] && restart || :
+}	
+
 force-reload() {
 	echo -n $"Force-reload not supported."
 	echo
@@ -194,6 +208,9 @@
   restart)
   	restart
 	;;
+  condrestart)
+  	condrestart
+	;;
   status)
   	dstatus
 	;;
@@ -201,6 +218,6 @@
   	force-reload
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status|force-reload}"
 	exit 1
 esac

openhpi-2.10.2-marshal.patch:

--- NEW FILE openhpi-2.10.2-marshal.patch ---
Index: marshal/marshal.c
===================================================================
--- marshal/marshal.c	(revision 6728)
+++ marshal/marshal.c	(working copy)
@@ -768,6 +768,7 @@
                         // is the only instance for which we use var arrays.
                         unsigned char *dd =
                         	(unsigned char *)malloc(va_type->m_u.m_struct.m_size*array_size);
+			memset(dd, 0, va_type->m_u.m_struct.m_size*array_size);
                         unsigned char *vardata = data + struct_element->m_u.m_struct_element.m_offset;
                         tUint32 j;
                         memcpy(vardata, &dd, sizeof(void *));

openhpi-2.10.2-snmp_bc-sessionid.patch:

--- NEW FILE openhpi-2.10.2-snmp_bc-sessionid.patch ---
Index: plugins/snmp_bc/t/tel001.c
===================================================================
--- plugins/snmp_bc/t/tel001.c	(revision 6728)
+++ plugins/snmp_bc/t/tel001.c	(working copy)
@@ -29,7 +29,6 @@
 	SaErrorT expected_err;
 				
 	SaHpiResourceIdT  id = 0;
-        SaHpiSessionIdT sessionid;
 	SaHpiEventLogInfoT info;
 		
 	struct oh_handler_state l_handle;
@@ -49,10 +48,6 @@
 	err = snmp_bc_get_sel_info(&l_handle, id, NULL);
 	checkstatus(err, expected_err, testfail);
 
-	/***************************
-	 * Cleanup after all tests
-	 ***************************/
-	err = tcleanup(&sessionid);
 	return testfail;
 
 }
Index: plugins/snmp_bc/t/tel005.c
===================================================================
--- plugins/snmp_bc/t/tel005.c	(revision 6728)
+++ plugins/snmp_bc/t/tel005.c	(working copy)
@@ -29,7 +29,6 @@
 	SaErrorT expected_err;
 					
 	SaHpiResourceIdT  id = 0;
-        SaHpiSessionIdT sessionid;
 	SaHpiEventLogEntryIdT current = 0;
 	SaHpiEventLogEntryIdT previd;
 	SaHpiEventLogEntryIdT nextid;
@@ -79,10 +78,6 @@
 		       	          &previd, &nextid, &entry, &rdr, &rptentry);
 	checkstatus(err, expected_err, testfail);
 
-	/***************************
-	 * Cleanup after all tests
-	 ***************************/
-	err = tcleanup(&sessionid);
 	return testfail;
 
 }
Index: plugins/snmp_bc/t/tsensorget016.c
===================================================================
--- plugins/snmp_bc/t/tsensorget016.c	(revision 6728)
+++ plugins/snmp_bc/t/tsensorget016.c	(working copy)
@@ -29,7 +29,6 @@
 	SaErrorT expected_err;
 
 	SaHpiResourceIdT  id = 1;
-        SaHpiSessionIdT sessionid;
 
 	SaHpiSensorNumT sid = 1;
 	SaHpiEventStateT state;
@@ -70,11 +69,7 @@
 	err = snmp_bc_get_sensor_eventstate(NULL , id, sid, NULL, NULL);
 	checkstatus(err, expected_err, testfail);
 	
-	/***************************
-	 * Cleanup after all tests
-	 ***************************/
-	 err = tcleanup(&sessionid);
-	 return testfail;
+	return testfail;
 
 }
 
Index: plugins/snmp_bc/t/tsptime002.c
===================================================================
--- plugins/snmp_bc/t/tsptime002.c	(revision 6728)
+++ plugins/snmp_bc/t/tsptime002.c	(working copy)
@@ -28,7 +28,6 @@
 	SaErrorT          err;
 	SaErrorT expected_err;
 
-        SaHpiSessionIdT sessionid;
 	struct tm time;
 	struct snmp_bc_hnd custom_handle;
 
@@ -47,10 +46,6 @@
 	err = snmp_bc_set_sp_time(&custom_handle, NULL);
 	checkstatus(err, expected_err, testfail);
 
-	/**************************
-	 * Cleanup after all tests
-	 ***************************/
-	err = tcleanup(&sessionid);
 	return testfail;
 
 }

openhpi-2.10.2-tests.patch:

--- NEW FILE openhpi-2.10.2-tests.patch ---
diff -Nrup openhpi-2.11.1.orig/plugins/simulator/t/Makefile.am openhpi-2.11.1/plugins/simulator/t/Makefile.am
--- openhpi-2.11.1.orig/plugins/simulator/t/Makefile.am	2008-03-14 09:28:12.000000000 +0100
+++ openhpi-2.11.1/plugins/simulator/t/Makefile.am	2008-03-26 09:36:26.000000000 +0100
@@ -25,6 +25,7 @@ TDEPLIB			= $(top_builddir)/src/libopenh
 TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator
 TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(top_builddir)/plugins/simulator/t/uid_map
 TESTS_ENVIRONMENT += OPENHPI_CONF=$(top_srcdir)/plugins/simulator/t/openhpi.conf
+TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs
 
 TESTS = sim_sanity_000 \
 	sim_sanity_001 \
diff -Nrup openhpi-2.11.1.orig/plugins/simulator/t/Makefile.in openhpi-2.11.1/plugins/simulator/t/Makefile.in
--- openhpi-2.11.1.orig/plugins/simulator/t/Makefile.in	2008-03-25 08:32:34.000000000 +0100
+++ openhpi-2.11.1/plugins/simulator/t/Makefile.in	2008-03-26 09:36:50.000000000 +0100
@@ -603,7 +603,8 @@ TDEPLIB = $(top_builddir)/src/libopenhpi
 
 TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator \
 	OPENHPI_UID_MAP=$(top_builddir)/plugins/simulator/t/uid_map \
-	OPENHPI_CONF=$(top_srcdir)/plugins/simulator/t/openhpi.conf
+	OPENHPI_CONF=$(top_srcdir)/plugins/simulator/t/openhpi.conf \
+	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs
 sim_sanity_000_SOURCES = sim_sanity_000.c
 sim_sanity_000_LDADD = $(TDEPLIB)
 sim_sanity_000_LDFLAGS = -export-dynamic
diff -Nrup openhpi-2.11.1.orig/plugins/snmp_bc/t/Makefile.am openhpi-2.11.1/plugins/snmp_bc/t/Makefile.am
--- openhpi-2.11.1.orig/plugins/snmp_bc/t/Makefile.am	2008-03-14 09:28:31.000000000 +0100
+++ openhpi-2.11.1/plugins/snmp_bc/t/Makefile.am	2008-03-26 09:38:00.000000000 +0100
@@ -95,7 +95,7 @@ TESTS_ENVIRONMENT  = OPENHPI_CONF=$(srcd
 TESTS_ENVIRONMENT += OPENHPI_SIMTEST_FILE=$(srcdir)/sim_test_file
 #TESTS_ENVIRONMENT += OPENHPI_DEBUG=YES
 #TESTS_ENVIRONMENT += OPENHPI_DEBUG_TRACE=YES
-TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs
+TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs:$(top_srcdir)/plugins/snmp/.libs:$(top_srcdir)/plugins/snmp_bc/t/.libs
 TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(shell pwd)/uid_map
 TESTS_ENVIRONMENT += OPENHPI_PATH=$(shell pwd)
 
diff -Nrup openhpi-2.11.1.orig/plugins/snmp_bc/t/Makefile.in openhpi-2.11.1/plugins/snmp_bc/t/Makefile.in
--- openhpi-2.11.1.orig/plugins/snmp_bc/t/Makefile.in	2008-03-25 08:32:34.000000000 +0100
+++ openhpi-2.11.1/plugins/snmp_bc/t/Makefile.in	2008-03-26 09:38:25.000000000 +0100
@@ -787,7 +787,7 @@ EVENT_XML_MAP_SCRIPT = $(top_srcdir)/scr
 #TESTS_ENVIRONMENT += OPENHPI_DEBUG_TRACE=YES
 TESTS_ENVIRONMENT = OPENHPI_CONF=$(srcdir)/openhpi.conf \
 	OPENHPI_SIMTEST_FILE=$(srcdir)/sim_test_file \
-	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs \
+	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs:$(top_srcdir)/plugins/snmp/.libs:$(top_srcdir)/plugins/snmp_bc/t/.libs \
 	OPENHPI_UID_MAP=$(shell pwd)/uid_map OPENHPI_PATH=$(shell pwd)
 
 # Unit test using normal IF calls and simulation library
diff -Nrup openhpi-2.11.1.orig/src/t/ohpi/Makefile.am openhpi-2.11.1/src/t/ohpi/Makefile.am
--- openhpi-2.11.1.orig/src/t/ohpi/Makefile.am	2008-03-14 09:28:50.000000000 +0100
+++ openhpi-2.11.1/src/t/ohpi/Makefile.am	2008-03-25 11:36:59.000000000 +0100
@@ -23,6 +23,7 @@ TDEPLIB                 = $(top_builddir
 TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator:$(top_builddir)/plugins/watchdog
 TESTS_ENVIRONMENT += OPENHPI_UID_MAP=$(top_builddir)/src/t/ohpi/uid_map
 TESTS_ENVIRONMENT += OPENHPI_CONF=$(top_srcdir)/src/t/ohpi/openhpi.conf
+TESTS_ENVIRONMENT += LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs
 
 TESTS = \
         ohpi_007 \
diff -Nrup openhpi-2.11.1.orig/src/t/ohpi/Makefile.in openhpi-2.11.1/src/t/ohpi/Makefile.in
--- openhpi-2.11.1.orig/src/t/ohpi/Makefile.in	2008-03-25 08:32:34.000000000 +0100
+++ openhpi-2.11.1/src/t/ohpi/Makefile.in	2008-03-25 11:37:24.000000000 +0100
@@ -330,7 +330,8 @@ TDEPLIB = $(top_builddir)/src/libopenhpi
 
 TESTS_ENVIRONMENT = OPENHPI_PATH=$(top_builddir)/plugins/simulator:$(top_builddir)/plugins/watchdog \
 	OPENHPI_UID_MAP=$(top_builddir)/src/t/ohpi/uid_map \
-	OPENHPI_CONF=$(top_srcdir)/src/t/ohpi/openhpi.conf
+	OPENHPI_CONF=$(top_srcdir)/src/t/ohpi/openhpi.conf \
+	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(top_srcdir)/utils/.libs
 ohpi_007_SOURCES = ohpi_007.c
 ohpi_007_LDADD = $(TDEPLIB)
 ohpi_008_SOURCES = ohpi_008.c


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Dec 2007 15:49:18 -0000	1.10
+++ .cvsignore	11 Apr 2008 13:30:58 -0000	1.11
@@ -1 +1 @@
-openhpi-2.10.1.tar.gz
+openhpi-2.10.2.tar.gz

openhpi-2.10.1-gcc43.patch:

Index: openhpi-2.10.1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi-2.10.1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openhpi-2.10.1-gcc43.patch	28 Feb 2008 15:55:04 -0000	1.1
+++ openhpi-2.10.1-gcc43.patch	11 Apr 2008 13:30:58 -0000	1.2
@@ -1,15 +1,3 @@
-diff -up openhpi-2.10.1/utils/epath_utils.h.gcc43 openhpi-2.10.1/utils/epath_utils.h
---- openhpi-2.10.1/utils/epath_utils.h.gcc43	2008-02-28 09:18:03.000000000 +0100
-+++ openhpi-2.10.1/utils/epath_utils.h	2008-02-28 09:18:09.000000000 +0100
-@@ -32,7 +32,7 @@
- #define OH_MAX_LOCATION_DIGITS 6
- 
- /* Definitions for describing entity path patterns */
--#define OH_MAX_EP_TUPLES SAHPI_MAX_ENTITY_PATH+1
-+#define OH_MAX_EP_TUPLES SAHPI_MAX_ENTITY_PATH+2
- 
- typedef struct {
-         SaHpiBoolT is_dot;
 diff -up openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp.gcc43 openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp
 --- openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp.gcc43	2008-02-28 09:26:14.000000000 +0100
 +++ openhpi-2.10.1/plugins/ipmidirect/ipmi_sensor_factors.cpp	2008-02-28 09:28:59.000000000 +0100


Index: openhpi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- openhpi.spec	28 Feb 2008 15:55:04 -0000	1.62
+++ openhpi.spec	11 Apr 2008 13:30:58 -0000	1.63
@@ -1,21 +1,26 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
-Version: 2.10.1
-Release: 3%{?dist}
+Version: 2.10.2
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
-Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
+URL: http://www.openhpi.org
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
 Patch1: openhpi-2.8.0-werror.patch
-#Patch2: openhpi-2.8.1-snmp_bc_discover.patch
-Patch3: openhpi-2.8.1-segfault.patch
-Patch4: openhpi-2.8.1-open.patch
-Patch5: openhpi-2.10.1-gcc43.patch
+Patch2: openhpi-2.8.1-open.patch
+Patch3: openhpi-2.10.1-gcc43.patch
+Patch4: openhpi-2.10.2-initd.patch
+Patch5: openhpi-2.10.2-tests.patch
+Patch6: openhpi-2.10.2-marshal.patch
+Patch7: openhpi-2.10.2-snmp_bc-sessionid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
-BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel
-BuildRequires: e2fsprogs-devel, openssl-devel, OpenIPMI-devel, ncurses-devel,
-BuildRequires: pkgconfig, net-tools
+BuildRequires: libtool-ltdl-devel, openssl-devel, ncurses-devel
+BuildRequires: libxml2-devel, pkgconfig, docbook-utils
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 ExcludeArch: ia64
 
 %description
@@ -32,73 +37,126 @@
 various types of hardware. This includes, but is not limited to, IPMI based
 servers, Blade Center, and machines which export data via sysfs.
 
+%package libs
+Group: System Environment/Libraries
+Summary: The system libraries for the openhpi project
+Obsoletes: %{name} < 2.10.2-1
+
+%description libs
+The system libraries for the openhpi project.
+
 %package devel
 Group: Development/Libraries
-Summary: The development environment for the openhpi project.
-Requires: %{name} = %{version}
+Summary: The development environment for the openhpi project
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
-The openhpi-devel package contains the development libraries and header files
-of the openhpi project.
+The development libraries and header files for the openhpi project.
 
 %prep
 %setup -q
 %patch1 -p1 -b .werror
-#%patch2 -p1 -b .snmp_bc_discover
-%patch3 -p1 -b .segfault
-%patch4 -p1 -b .open
-%patch5 -p1 -b .gcc43
+%patch2 -p1 -b .open
+%patch3 -p1 -b .gcc43
+%patch4 -p0 -b .initd
+%patch5 -p1 -b .tests
+%patch6 -p0 -b .vararray
+%patch7 -p0 -b .sessionid
+
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --disable-dummy --disable-sysfs
+%configure --disable-static --disable-dummy --disable-sysfs
+
+# Don't use rpath!
+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
+
+# temp hack for glib2
+%ifarch ppc ppc64
+sed -i 's/ -Werror//g' utils/Makefile
+sed -i 's/ -Werror//g' utils/t/*/Makefile
+sed -i 's/ -Werror//g' openhpid/Makefile
+sed -i 's/ -Werror//g' src/Makefile
+%endif
+
 make %{?_smp_mflags}
 
+
 %install
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openhpi
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-mkdir -p -m1777 $RPM_BUILD_ROOT%{_var}/lib/openhpi
+mkdir -p -m1777 $RPM_BUILD_ROOT%{_var}/lib/%{name}
 make install DESTDIR=$RPM_BUILD_ROOT
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/openhpi
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # RH-ify the initscript location
 mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openhpid $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/openhpi/*.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/openhpi/standard/*.la
-#rm -rf $RPM_BUILD_ROOT/%{_libdir}/libopenhpi.*
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la
+
+# fix perms for generated docs
+chmod 0644 docs/hld/openhpi-manual/*.html
+
+
+%check
+make check
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/chkconfig --add openhpid
+
+%preun
+if [ $1 = 0 ] ; then
+    /sbin/service openhpid stop >/dev/null 2>&1
+    /sbin/chkconfig --del openhpid
+fi
+
+%postun
+if [ "$1" -ge "1" ] ; then
+    /sbin/service openhpid condrestart >/dev/null 2>&1
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root)
-%doc README.daemon
-%dir %{_sysconfdir}/openhpi
-%config %{_sysconfdir}/openhpi/openhpi.conf
+%doc COPYING README README.daemon docs/hld/openhpi-manual openhpi.conf.example
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config %{_sysconfdir}/rc.d/init.d/openhpid
-%attr(1777,root,root) %{_var}/lib/openhpi
-%{_libdir}/*.so.*
+%attr(1777,root,root) %{_var}/lib/%{name}
 %{_bindir}/*
 %{_sbindir}/*
-%{_libdir}/openhpi
+%{_libdir}/%{name}
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 
+%files libs
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+
 %files devel
 %defattr(-,root,root)
+%doc COPYING
 %{_libdir}/*.so
-%{_libdir}/*.a
-%{_includedir}/openhpi
+%{_includedir}/%{name}
 %{_libdir}/pkgconfig/*
 
 
 %changelog
+* Thu Mar 13 2008 Dan Horak <dan[at]danny.cz> - 2.10.2-1
+- update to 2.10.2
+- spec file and patch cleanup
+
 * Thu Feb 28 2008 Phil Knirsch <pknirsch at redhat.com> - 2.10.1-3
 - Removed incorrect patch for IBM BC snmp_bc plugin
 - Fixed GCC 4.3 rebuild problems


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Dec 2007 15:49:18 -0000	1.10
+++ sources	11 Apr 2008 13:30:58 -0000	1.11
@@ -1 +1 @@
-b8b771b310046bb14db8113fd1720431  openhpi-2.10.1.tar.gz
+554dbb73b643fff8aa81fcf1f23ca339  openhpi-2.10.2.tar.gz


--- openhpi-2.8.1-segfault.patch DELETED ---


--- openhpi-2.8.1-snmp_bc_discover.patch DELETED ---




More information about the fedora-extras-commits mailing list