Hello community, here is the log from the commit of package pcp-gui for openSUSE:Factory checked in at Thu Sep 1 17:22:00 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcp-gui/pcp-gui.changes 2011-08-04 12:43:24.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 4 12:41:55 CEST 2011 - [email protected] + +- Explicitly define BuildRoot in spec file to fix SLE11 builds. + +------------------------------------------------------------------- +Thu Jul 7 19:47:47 CEST 2011 - [email protected] + +- Handle separate qt-assistant library and include paths. + calling whatdependson for head-i586 New: ---- fix_desktop_file.diff pcp-gui-1.5.1.src.tar.gz pcp-gui.changes pcp-gui.spec qt_assist_path.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp-gui.spec ++++++ # # spec file for package pcp-gui # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: pcp-gui Version: 1.5.1 Release: 1 Summary: Visualisation tools for the Performance Co-Pilot toolkit License: GPLv2 Url: http://oss.sgi.com/projects/pcp Group: System/Monitoring Source: %{name}-%{version}.src.tar.gz Requires: pcp >= 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libpcp-devel libpcp3 pcp >= 2.0 BuildRequires: bison flex update-desktop-files %if "%{_vendor}" == "suse" Requires: qt >= 4.2 BuildRequires: libqt4-devel qt-devel >= 4.2 %else Requires: qt4 >= 4.2 BuildRequires: qt4-devel >= 4.2 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 BuildRequires: qt4-assistant-adp-devel %endif Patch0: fix_desktop_file.diff Patch1: qt_assist_path.diff %description The PCP GUI package primarily includes visualisation tools for monitoring systems using live and archived Performance Co-Pilot (PCP) sources. These tools have dependencies on graphics libraries which may or may not be installed on server machines, so PCP GUI is delivered, managed and maintained as a separate (source and binary) package to the core PCP infrastructure. %package -n pcp-doc License: GPLv2 %if 0%{?suse_version} > 1110 BuildArch: noarch %endif Group: Documentation/HTML Conflicts: pcp-gui < 1.5.0 Summary: Performance Co-Pilot documentation and tutorials Url: http://oss.sgi.com/projects/pcp/ %description -n pcp-doc The pcp-doc package provides useful information on using and configuring the Performance Co-Pilot (PCP) toolkit for system level performance management. It includes tutorials, HOWTOs, and other detailed documentation about the internals of core PCP utilities and daemons, and the PCP graphical tools. %prep %setup -q %patch0 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %patch1 %endif autoconf %configure %clean [ ! -z "$DIST_ROOT" ] && rm -rf $DIST_ROOT rm -rf $RPM_BUILD_ROOT %build make default-pcp-gui %install BACKDIR=`pwd`; DIST_ROOT="$RPM_BUILD_ROOT" export DIST_ROOT make install-pcp-gui %suse_update_desktop_file -i pmchart %files %defattr(-,root,root) %dir %attr(755,root,root) %{_libexecdir}/pcp/bin %dir %attr(755,root,root) %{_datadir}/doc/pcp-gui %dir %attr(755,root,root) %{_datadir}/pcp/demos/tutorials %dir %attr(755,root,root) %{_localstatedir}/lib/pcp/config/pmafm %dir %attr(755,root,root) %{_localstatedir}/lib/pcp/config/pmchart %dir %attr(755,root,root) %{_localstatedir}/lib/pcp/config/pmsnap %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/CPU %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Disk %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Diskbytes %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Filesystem %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Loadavg %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Memory %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/NFS2 %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/NFS3 %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Netbytes %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Netpackets %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Overview %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/PMCD %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Paging %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Schemes %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Sockets %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Swap %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmchart/Syscalls %doc %attr(0444,root,root) %{_localstatedir}/lib/pcp/config/pmafm/pcp-gui %doc %attr(644,root,root) %{_datadir}/doc/pcp-gui/README %doc %attr(644,root,root) %{_datadir}/doc/pcp-gui/COPYING %doc %attr(644,root,root) %{_datadir}/pixmaps/pmchart.png %doc %attr(644,root,root) %{_datadir}/pixmaps/pmtime.png %doc %attr(644,root,root) %{_datadir}/pcp/demos/tutorials/cpuperf.tar.gz %doc %attr(644,root,root) %{_datadir}/pcp/demos/tutorials/diskmodel.tar.gz %doc %attr(644,root,root) %{_datadir}/pcp/demos/tutorials/diskperf.tar.gz %doc %attr(644,root,root) %{_datadir}/pcp/demos/tutorials/pmie.tar.gz %doc %attr(644,root,root) %{_datadir}/pcp/demos/tutorials/pmview.tar.gz %doc %attr(644,root,root) %{_mandir}/man1/pmchart.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmdumptext.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmconfirm.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmsnap.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmtime.1.gz %doc %attr(644,root,root) %{_mandir}/man1/kmchart.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmmessage.1.gz %doc %attr(644,root,root) %{_mandir}/man1/pmquery.1.gz %doc %attr(644,root,root) %{_datadir}/doc/pcp-gui/pcp-gui.lsm %doc %attr(644,root,root) %{_datadir}/applications/pmchart.desktop %doc %attr(644,root,root) %{_localstatedir}/lib/pcp/config/pmsnap/Snap %config(noreplace) %doc %attr(644,root,root) %{_localstatedir}/lib/pcp/config/pmsnap/control %config(noreplace) %doc %attr(644,root,root) %{_localstatedir}/lib/pcp/config/pmsnap/crontab %attr(644,root,root) %{_localstatedir}/lib/pcp/config/pmsnap/summary.html %attr(755,root,root) %{_bindir}/pmchart %attr(755,root,root) %{_bindir}/pmdumptext %attr(755,root,root) %{_bindir}/pmconfirm %attr(755,root,root) %{_bindir}/pmmessage %attr(755,root,root) %{_bindir}/pmquery %attr(755,root,root) %{_libexecdir}/pcp/bin/pmsnap %attr(755,root,root) %{_bindir}/pmtime %attr(755,root,root) %{_bindir}/kmchart %files -n pcp-doc %defattr(-,root,root) %dir %{_datadir}/doc/pcp-doc %dir %{_datadir}/doc/pcp-doc/html %doc %{_datadir}/doc/pcp-doc/*/* %changelog ++++++ fix_desktop_file.diff ++++++ Index: src/chart/pmchart.desktop =================================================================== --- src/chart/pmchart.desktop.orig +++ src/chart/pmchart.desktop @@ -1,8 +1,9 @@ [Desktop Entry] Name=PCP Charts +GenericName=PCP Charts Comment=Strip Chart tool for plotting Performance Co-Pilot metrics. Exec=pmchart Icon=pmchart.png Terminal=false Type=Application -Categories=System;Utility; +Categories=System;Monitor; ++++++ qt_assist_path.diff ++++++ Index: src/libqwt/libqwt.pro.in =================================================================== --- src/libqwt/libqwt.pro.in.orig +++ src/libqwt/libqwt.pro.in @@ -2,6 +2,7 @@ TARGET = qwt TEMPLATE = lib VERSION = 5.2.0 CONFIG += qt staticlib warn_on @qt_release@ +INCLUDEPATH += /usr/include/QtAssistant HEADERS += \ qwt.h \ Index: src/chart/pmchart.pro.in =================================================================== --- src/chart/pmchart.pro.in.orig +++ src/chart/pmchart.pro.in @@ -30,10 +30,12 @@ ICON = pmchart.icns RC_FILE = pmchart.rc RESOURCES = pmchart.qrc INCLUDEPATH += ../include ../libqmc ../libqwt +INCLUDEPATH += /usr/include/QtAssistant win32:INCLUDEPATH += @pcp_dir@/include @pcp_dir@/local/include LIBS = -lpcp -L../libqmc -lqmc -L../libqwt -lqwt LIBS += -L../libqmc/@qt_release@ -L../libqmc/build/@qt_release@ LIBS += -L../libqwt/@qt_release@ -L../libqwt/build/@qt_release@ +LIBS += -lQtAssistantClient win32:LIBS += -L@pcp_dir@/bin -L@pcp_dir@/local/bin -L@pcp_dir@/lib win32:LIBS += -lwsock32 QT += @qt_assistant@ network Index: src/time/pmtime.pro.in =================================================================== --- src/time/pmtime.pro.in.orig +++ src/time/pmtime.pro.in @@ -12,9 +12,11 @@ ICON = pmtime.icns RC_FILE = pmtime.rc RESOURCES = pmtime.qrc INCLUDEPATH += ../include ../libqwt +INCLUDEPATH += /usr/include/QtAssistant win32:INCLUDEPATH += @pcp_dir@/include LIBS = -lpcp -L../libqwt -lqwt LIBS += -L../libqwt/@qt_release@ -L../libqwt/build/@qt_release@ +LIBS += -lQtAssistantClient win32:LIBS += -L @pcp_dir@/bin -L @pcp_dir@/local/bin -lwsock32 QT += @qt_assistant@ network CONFIG += qt assistant warn_on @qt_release@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
