remove pcp-import-sheet2pcp subpackage due to missing deps (BZ 830923) - 3.6.3-1.2

This commit is contained in:
Mark Goodwin 2012-06-21 13:48:22 +10:00
parent ef1432535f
commit 85c6a1bdba
1 changed files with 7 additions and 20 deletions

View File

@ -3,7 +3,7 @@ Name: pcp
Version: 3.6.3
%define buildversion 1
Release: %{buildversion}%{?dist}.1
Release: %{buildversion}%{?dist}.2
License: GPLv2
URL: http://oss.sgi.com/projects/pcp
Group: Applications/System
@ -151,20 +151,6 @@ Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat
Performance Co-Pilot (PCP) front-end tools for importing iostat data
into standard PCP archive logs for replay with any PCP monitoring tool.
#
# pcp-import-sheet2pcp
#
%package import-sheet2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs
URL: http://oss.sgi.com/projects/pcp/
Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat
%description import-sheet2pcp
Performance Co-Pilot (PCP) front-end tools for importing spreadsheet data
into standard PCP archive logs for replay with any PCP monitoring tool.
#
# pcp-import-mrtg2pcp
#
@ -200,6 +186,9 @@ make install_pcp
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp
# remove sheet2pcp until BZ 830923 and BZ 754678 are resolved.
rm -f $RPM_BUILD_ROOT/%{_bindir}/sheet2pcp $RPM_BUILD_ROOT/%{_mandir}/man1/sheet2pcp.1.gz
# default chkconfig off for Fedora and RHEL
for f in $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/{pcp,pmie,pmproxy}; do
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
@ -336,11 +325,6 @@ fi
%{_bindir}/iostat2pcp
%{_mandir}/man1/iostat2pcp.1.gz
%files import-sheet2pcp
%defattr(-,root,root)
%{_bindir}/sheet2pcp
%{_mandir}/man1/sheet2pcp.1.gz
%files import-mrtg2pcp
%defattr(-,root,root)
%{_bindir}/mrtg2pcp
@ -359,6 +343,9 @@ fi
%defattr(-,root,root)
%changelog
* Thu Jun 21 2012 Mark Goodwin <mgoodwin@redhat.com>
- remove pcp-import-sheet2pcp subpackage due to missing deps (BZ 830923) - 3.6.3-1.2
* Fri May 18 2012 Dan Horák <dan[at]danny.cz> - 3.6.3-1.1
- fix build on s390x