From cf3c5dc744da7c0a87de44ab6fe963aba3177349 Mon Sep 17 00:00:00 2001 From: Jan Šafránek Date: Oct 23 2008 12:34:03 +0000 Subject: fix typos in the descriptions add .desktop file for openipmigui tool remove ipmitool from all files add some TODOs and comments to the spec file --- diff --git a/.cvsignore b/.cvsignore index 4d9ed82..51a9cde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ OpenIPMI-2.0.14.tar.gz -ipmitool-1.8.9.tar.gz diff --git a/OpenIPMI.spec b/OpenIPMI.spec index 6d86b50..37bb22d 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -1,3 +1,5 @@ +# TODO: uses private copy of libedit, should be modified to use system one + %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI @@ -9,9 +11,11 @@ URL: http://sourceforge.net/projects/openipmi/ Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: openipmi.sysconf Source2: openipmi.initscript +Source3: openipmigui.desktop 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 perl-devel chrpath tcl-devel tkinter +BuildRequires: desktop-file-utils Requires(post): chkconfig Requires(preun): chkconfig @@ -41,7 +45,7 @@ Group: Development/Libraries Summary: OpenIPMI Python language bindings %description python -The OpenIPMI-perl package contains the Python language bindings for OpenIPMI. +The OpenIPMI-python package contains the Python language bindings for OpenIPMI. %package devel Group: Development/Libraries @@ -55,12 +59,12 @@ of the OpenIPMI project. %package gui Group: System Environment/Base -Summary: OpenIPMU graphical user interface tool +Summary: OpenIPMI graphical user interface tool Requires: tix tkinter %{name}-python = %{version}-%{release} %description gui -The OpenIPMI-devel package contains the graphical user interface to monitor -and control IPMI-enabled device. +The OpenIPMI-gui package contains the graphical user interface to monitor +and control IPMI-enabled devices. %prep @@ -70,7 +74,7 @@ and control IPMI-enabled device. export CFLAGS=-fPIC %configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool -make +make # not %{?_smp_mflags} safe %install rm -rf $RPM_BUILD_ROOT @@ -88,6 +92,8 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi install -d ${RPM_BUILD_ROOT}%{_initrddir} install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi +desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} + %post /sbin/chkconfig --add ipmi @@ -137,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT %files python %defattr(-,root,root) -%{_libdir}/python*/site-packages/*OpenIPMI* +%{python_sitearch}/*OpenIPMI* %files libs %defattr(-,root,root) @@ -154,9 +160,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/openipmigui %{_mandir}/man1/openipmigui* -%{_libdir}/python*/site-packages/openipmigui +%{python_sitearch}/openipmigui +%{_datadir}/applications/fedora-openipmigui.desktop %changelog +* Thu Oct 23 2008 Jan Safranek - 2.0.14-5 +- fix typos in the descriptions +- add .desktop file for openipmigui tool + * Mon Oct 20 2008 Jan Safranek - 2.0.14-4 - fix description of the package diff --git a/openipmigui.desktop b/openipmigui.desktop new file mode 100644 index 0000000..36ace18 --- /dev/null +++ b/openipmigui.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=OpenIPMI GUI +Comment=Manage local or remote systems using IPMI protocol +Exec=/usr/bin/openipmigui +Terminal=false +Type=Application +Categories=Application;System diff --git a/sources b/sources index 640ff74..c31fffb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ f766680bb237ca2f837c005efba54efa OpenIPMI-2.0.14.tar.gz -3b4dbdbaa1edff3dccaf88d161b34cd2 ipmitool-1.8.9.tar.gz