rpms/OpenIPMI/devel OpenIPMI.spec, 1.51, 1.52 openipmi.initscript, 1.10, 1.11

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23335

Modified Files:
	OpenIPMI.spec openipmi.initscript 
Log Message:
- split ipmitool to separate package
- add 'reload' functionality to init script
Resolves: #177970


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- OpenIPMI.spec	30 Jul 2008 11:49:51 -0000	1.51
+++ OpenIPMI.spec	17 Oct 2008 10:34:11 -0000	1.52
@@ -3,19 +3,16 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
 Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-Source2: http://downloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
-Source3: openipmi.sysconf
-Source4: openipmi.initscript
-Patch100: ipmitool-1.8.9-open.patch
+Source1: openipmi.sysconf
+Source2: openipmi.initscript
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildRequires: openssl-devel python-devel readline-devel popt-devel
-BuildRequires: perl-devel chrpath
+BuildRequires: openssl-devel python-devel perl-devel chrpath
 Requires(post): chkconfig
 Requires(preun): chkconfig
 
@@ -32,14 +29,6 @@
 The OpenIPMI-libs package contains the runtime libraries for shared binaries
 and applications.
 
-%package tools
-Group: Applications/System
-Summary: OpenIPMI utilities and scripts from ipmitool
-
-%description tools
-The OpenIPMI-tools package contains the addon utilities and script from the
-ipmitool project.
-
 %package perl
 Group: Development/Libraries
 Summary: OpenIPMI Perl language bindings
@@ -66,24 +55,13 @@
 of the OpenIPMI project.
 
 %prep
-%setup -q -a 2
-pushd ipmitool-%{ipmitoolver}
-%patch100 -p1 -b .open
-for f in AUTHORS ChangeLog; do
-    iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
-    mv ${f}.utf8 ${f}
-done
-popd
+%setup -q
 
 %build
 export CFLAGS=-fPIC
-%configure --with-pythoninstall=%{python_sitearch}
+%configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --with-tkinter=no
 sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 make
-pushd ipmitool-%{ipmitoolver}
-%configure
-make 
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,15 +73,11 @@
 %endif
 # Remove rpaths from libOpenIPMIposix.so.0.0.1
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1
-pushd ipmitool-%{ipmitoolver}
-make install DESTDIR=$RPM_BUILD_ROOT
-#rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/
-popd
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
 install -d ${RPM_BUILD_ROOT}%{_initrddir}
-install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi
+install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi
 
 %post
 /sbin/chkconfig --add ipmi
@@ -140,7 +114,6 @@
 %{_bindir}/solterm
 %{_mandir}/man1/ipmi_ui*
 %{_mandir}/man1/openipmicmd*
-%{_mandir}/man1/openipmigui*
 %{_mandir}/man1/openipmish*
 %{_mandir}/man1/rmcp_ping*
 %{_mandir}/man1/solterm*
@@ -155,15 +128,7 @@
 
 %files python
 %defattr(-,root,root)
-%{_libdir}/python*/site-packages/*
-
-%files tools
-%defattr(-,root,root)
-%{_bindir}/ipmitool
-%{_mandir}/man1/ipmitool*
-%{_mandir}/man8/ipmievd*
-%{_datadir}/doc/ipmitool
-/usr/sbin/ipmievd
+%{_libdir}/python*/site-packages/*OpenIPMI*
 
 %files libs
 %defattr(-,root,root)
@@ -171,13 +136,16 @@
 
 %files devel
 %defattr(-,root,root)
-%{_mandir}/man7/*
 %{_includedir}/OpenIPMI
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Oct 16 2008 Jan Safranek <jsafrane at redhat.com> - 2.0.14-3
+- split ipmitool to separate package
+- add 'reload' functionality to init script
+
 * Wed Jul 30 2008 Phil Knirsch <pknirsch at redhat.com> - 2.0.14-2
 - Fixed rpath problem in libOpenIPMIposix.so.0.0.1
 


Index: openipmi.initscript
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/openipmi.initscript,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openipmi.initscript	1 Aug 2006 11:34:45 -0000	1.10
+++ openipmi.initscript	17 Oct 2008 10:34:12 -0000	1.11
@@ -464,6 +464,15 @@
 
 #############################################################################
 
+reload()
+{
+	stop_all
+	RETVAL=0
+	start
+}
+
+#############################################################################
+
 status_all()
 {
 	minimum_modules_loaded
@@ -552,6 +561,7 @@
 	start) start ;;
 	stop)  stop ;;
 	restart) restart ;;
+	reload) reload ;;
 	status)	status ;;
 	status-all) status_all ;;
 	condrestart) condrestart ;;