Accepting request 505499 from home:dmdiss:pcp-311
- Fix a number of file manifest conflicts. - Drop lio pmda on SUSE systems without proper rtslib-fb dependency. OBS-URL: https://build.opensuse.org/request/show/505499 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=53
This commit is contained in:
David Disseldorp
Git OBS Bridge
parent
177df83471
commit
16aef573a0
@ -5,6 +5,8 @@ Mon Jun 19 23:09:32 UTC 2017 - ddiss@suse.com
|
||||
libpcp_mmv.so.1, libpcp_trace.so.2, libpcp_import.so.1 and libpcp_web.so.1
|
||||
out from libpcp3 into separate packages.
|
||||
- Drop a number of unneeded explicit library package Requires.
|
||||
- Fix a number of file manifest conflicts.
|
||||
- Drop lio pmda on SUSE systems without proper rtslib-fb dependency.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 18 19:53:55 UTC 2017 - ddiss@suse.com
|
||||
|
||||
111
pcp.spec
111
pcp.spec
@ -59,6 +59,13 @@ BuildRequires: -post-build-checks
|
||||
%global license_mit MIT
|
||||
%endif
|
||||
|
||||
%global libpcp_pmda_sover 3
|
||||
%global libpcp_gui_sover 2
|
||||
%global libpcp_mmv_sover 1
|
||||
%global libpcp_trace_sover 2
|
||||
%global libpcp_import_sover 1
|
||||
%global libpcp_web_sover 1
|
||||
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: %{license_gplv2plus} and %{license_lgplv2plus} and %{license_cc_by}
|
||||
Group: %{pcp_gr}
|
||||
@ -209,6 +216,13 @@ Patch9: 0009-pmsnap-control-var-www-srv-www.patch
|
||||
%global disable_noarch 1
|
||||
%endif
|
||||
|
||||
# python3-rtslib-fb not yet available on SUSE, see boo#1045332
|
||||
%if 0%{?suse_version} && !%{disable_python3}
|
||||
%global disable_lio 1
|
||||
%else
|
||||
%global disable_lio 0
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%else
|
||||
@ -419,49 +433,49 @@ Requires: pcp-conf >= %{version}-%{release}
|
||||
Performance Co-Pilot (PCP) run-time libraries
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%package -n libpcp_gui2
|
||||
%package -n libpcp_gui%{libpcp_gui_sover}
|
||||
Summary: Performance Co-Pilot run-time GUI library
|
||||
License: %{license_lgplv21plus}
|
||||
Group: %{lib_gr}
|
||||
Url: http://www.pcp.io
|
||||
|
||||
%description -n libpcp_gui2
|
||||
%description -n libpcp_gui%{libpcp_gui_sover}
|
||||
Performance Co-Pilot (PCP) run-time graphical user interface library
|
||||
|
||||
%package -n libpcp_mmv1
|
||||
%package -n libpcp_mmv%{libpcp_mmv_sover}
|
||||
Summary: Performance Co-Pilot run-time MMV library
|
||||
License: %{license_lgplv21plus}
|
||||
Group: %{lib_gr}
|
||||
Url: http://www.pcp.io
|
||||
|
||||
%description -n libpcp_mmv1
|
||||
%description -n libpcp_mmv%{libpcp_mmv_sover}
|
||||
Performance Co-Pilot (PCP) run-time Memory Mapped Values library
|
||||
|
||||
%package -n libpcp_trace2
|
||||
%package -n libpcp_trace%{libpcp_trace_sover}
|
||||
Summary: Performance Co-Pilot run-time tracing library
|
||||
License: %{license_lgplv21plus}
|
||||
Group: %{lib_gr}
|
||||
Url: http://www.pcp.io
|
||||
|
||||
%description -n libpcp_trace2
|
||||
%description -n libpcp_trace%{libpcp_trace_sover}
|
||||
Performance Co-Pilot (PCP) run-time tracing library
|
||||
|
||||
%package -n libpcp_import1
|
||||
%package -n libpcp_import%{libpcp_import_sover}
|
||||
Summary: Performance Co-Pilot run-time import library
|
||||
License: %{license_lgplv21plus}
|
||||
Group: %{lib_gr}
|
||||
Url: http://www.pcp.io
|
||||
|
||||
%description -n libpcp_import1
|
||||
%description -n libpcp_import%{libpcp_import_sover}
|
||||
Performance Co-Pilot (PCP) run-time import library
|
||||
|
||||
%package -n libpcp_web1
|
||||
%package -n libpcp_web%{libpcp_web_sover}
|
||||
Summary: Performance Co-Pilot run-time web library
|
||||
License: %{license_lgplv21plus}
|
||||
Group: %{lib_gr}
|
||||
Url: http://www.pcp.io
|
||||
|
||||
%description -n libpcp_web1
|
||||
%description -n libpcp_web%{libpcp_web_sover}
|
||||
Performance Co-Pilot (PCP) run-time web library
|
||||
%endif
|
||||
|
||||
@ -1520,6 +1534,7 @@ and hypervisor machines.
|
||||
# end pcp-pmda-libvirt
|
||||
%endif
|
||||
|
||||
%if !%{disable_lio}
|
||||
#
|
||||
# pcp-pmda-lio
|
||||
#
|
||||
@ -1530,11 +1545,19 @@ Group: %{pcp_gr}
|
||||
Url: http://www.pcp.io
|
||||
%if !%{disable_python3}
|
||||
Requires: python3-pcp
|
||||
Requires: python3-rtslib
|
||||
%if 0%{?suse_version}
|
||||
Requires: python3-rtslib-fb
|
||||
%else
|
||||
Requires: python3-rtslib
|
||||
%endif
|
||||
%else # !%{disable_python3}
|
||||
Requires: python-pcp
|
||||
%if 0%{?suse_version}
|
||||
Requires: python-rtslib-fb
|
||||
%else
|
||||
Requires: python-rtslib
|
||||
%endif
|
||||
%endif # !%{disable_python3}
|
||||
%description pmda-lio
|
||||
This package provides a PMDA to gather performance metrics from the kernels
|
||||
iSCSI target interface (LIO). The metrics are stored by LIO within the Linux
|
||||
@ -1542,6 +1565,7 @@ kernels configfs filesystem. The PMDA provides per LUN level stats, and a
|
||||
summary instance per iSCSI target, which aggregates all LUN metrics within the
|
||||
target.
|
||||
#end pcp-pmda-lio
|
||||
%endif # !%{disable_lio}
|
||||
|
||||
%endif # !%{disable_python2} || !%{disable_python3}
|
||||
|
||||
@ -2133,6 +2157,10 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{disable_lio}
|
||||
rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/lio
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
rm -rf $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps
|
||||
|
||||
@ -2595,20 +2623,20 @@ cd
|
||||
%post -n %{lib_pkg} -p /sbin/ldconfig
|
||||
%postun -n %{lib_pkg} -p /sbin/ldconfig
|
||||
%if 0%{?suse_version}
|
||||
%post -n libpcp_gui2 -p /sbin/ldconfig
|
||||
%postun -n libpcp_gui2 -p /sbin/ldconfig
|
||||
%post -n libpcp_gui%{libpcp_gui_sover} -p /sbin/ldconfig
|
||||
%postun -n libpcp_gui%{libpcp_gui_sover} -p /sbin/ldconfig
|
||||
|
||||
%post -n libpcp_mmv1 -p /sbin/ldconfig
|
||||
%postun -n libpcp_mmv1 -p /sbin/ldconfig
|
||||
%post -n libpcp_mmv%{libpcp_mmv_sover} -p /sbin/ldconfig
|
||||
%postun -n libpcp_mmv%{libpcp_mmv_sover} -p /sbin/ldconfig
|
||||
|
||||
%post -n libpcp_trace2 -p /sbin/ldconfig
|
||||
%postun -n libpcp_trace2 -p /sbin/ldconfig
|
||||
%post -n libpcp_trace%{libpcp_trace_sover} -p /sbin/ldconfig
|
||||
%postun -n libpcp_trace%{libpcp_trace_sover} -p /sbin/ldconfig
|
||||
|
||||
%post -n libpcp_import1 -p /sbin/ldconfig
|
||||
%postun -n libpcp_import1 -p /sbin/ldconfig
|
||||
%post -n libpcp_import%{libpcp_import_sover} -p /sbin/ldconfig
|
||||
%postun -n libpcp_import%{libpcp_import_sover} -p /sbin/ldconfig
|
||||
|
||||
%post -n libpcp_web1 -p /sbin/ldconfig
|
||||
%postun -n libpcp_web1 -p /sbin/ldconfig
|
||||
%post -n libpcp_web%{libpcp_web_sover} -p /sbin/ldconfig
|
||||
%postun -n libpcp_web%{libpcp_web_sover} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if !%{disable_selinux}
|
||||
@ -2668,8 +2696,6 @@ fi
|
||||
%exclude %{_docdir}/pcp/trivial
|
||||
%exclude %{_docdir}/pcp/txmon
|
||||
%exclude %{_testsdir}
|
||||
# -> pcp-pmda-infiniband
|
||||
%exclude %{_pmdasdir}/infiniband
|
||||
%endif
|
||||
|
||||
%dir %{_confdir}
|
||||
@ -2680,12 +2706,9 @@ fi
|
||||
%dir %{_libdir}/pcp
|
||||
%dir %{_libdir}/pcp/bin
|
||||
%endif
|
||||
%{_localstatedir}/lib/pcp
|
||||
%dir %{_localstatedir}/lib/pcp/config
|
||||
%if 0%{?suse_version}
|
||||
# part of pcp-gui
|
||||
%exclude %{_localstatedir}/lib/pcp/config/pmsnap
|
||||
%exclude %{_localstatedir}/lib/pcp/config/pmchart
|
||||
%exclude %{_localstatedir}/lib/pcp/config/pmafm/pcp-gui
|
||||
%{_initddir}/pcp
|
||||
%{_initddir}/pmcd
|
||||
@ -2789,35 +2812,35 @@ fi
|
||||
|
||||
%files -n %{lib_pkg}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp.so.3
|
||||
%{_libdir}/libpcp_pmda.so.3
|
||||
%{_libdir}/libpcp.so.%{libpcp_pmda_sover}
|
||||
%{_libdir}/libpcp_pmda.so.%{libpcp_pmda_sover}
|
||||
%if !0%{?suse_version}
|
||||
%{_libdir}/libpcp_gui.so.2
|
||||
%{_libdir}/libpcp_mmv.so.1
|
||||
%{_libdir}/libpcp_trace.so.2
|
||||
%{_libdir}/libpcp_import.so.1
|
||||
%{_libdir}/libpcp_web.so.1
|
||||
%{_libdir}/libpcp_gui.so.%{libpcp_gui_sover}
|
||||
%{_libdir}/libpcp_mmv.so.%{libpcp_mmv_sover}
|
||||
%{_libdir}/libpcp_trace.so.%{libpcp_trace_sover}
|
||||
%{_libdir}/libpcp_import.so.%{libpcp_import_sover}
|
||||
%{_libdir}/libpcp_web.so.%{libpcp_web_sover}
|
||||
%else
|
||||
|
||||
%files -n libpcp_gui2
|
||||
%files -n libpcp_gui%{libpcp_gui_sover}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp_gui.so.2
|
||||
%{_libdir}/libpcp_gui.so.%{libpcp_gui_sover}
|
||||
|
||||
%files -n libpcp_mmv1
|
||||
%files -n libpcp_mmv%{libpcp_mmv_sover}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp_mmv.so.1
|
||||
%{_libdir}/libpcp_mmv.so.%{libpcp_mmv_sover}
|
||||
|
||||
%files -n libpcp_trace2
|
||||
%files -n libpcp_trace%{libpcp_trace_sover}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp_trace.so.2
|
||||
%{_libdir}/libpcp_trace.so.%{libpcp_trace_sover}
|
||||
|
||||
%files -n libpcp_import1
|
||||
%files -n libpcp_import%{libpcp_import_sover}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp_import.so.1
|
||||
%{_libdir}/libpcp_import.so.%{libpcp_import_sover}
|
||||
|
||||
%files -n libpcp_web1
|
||||
%files -n libpcp_web%{libpcp_web_sover}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpcp_web.so.1
|
||||
%{_libdir}/libpcp_web.so.%{libpcp_web_sover}
|
||||
%endif
|
||||
|
||||
%files -n %{lib_devel_pkg}
|
||||
@ -2956,8 +2979,10 @@ fi
|
||||
%files pmda-docker
|
||||
%{_pmdasdir}/docker
|
||||
|
||||
%if !%{disable_lio}
|
||||
%files pmda-lio
|
||||
%{_pmdasdir}/lio
|
||||
%endif
|
||||
|
||||
%files pmda-lustre
|
||||
%{_pmdasdir}/lustre
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user