This commit is contained in:
parent
b9348f2f22
commit
fab06b6438
@ -79,3 +79,14 @@ diff -ur pcp-2.5.0/src/pmpost/GNUmakefile pcp-2.5.0.SuSE/src/pmpost/GNUmakefile
|
||||
|
||||
default_pcp: default
|
||||
|
||||
--- pcp-2.5.0-51/src/libpcp/src/connect.c 2005-11-29 02:40:20.000000000 +0100
|
||||
+++ pcp-2.5.0/src/libpcp/src/connect.c 2007-07-12 15:42:43.000000000 +0200
|
||||
@@ -253,7 +253,7 @@
|
||||
__pmConnectPMCD(const char *hostname)
|
||||
{
|
||||
__pmIPC ipcinfo = { UNKNOWN_VERSION, NULL };
|
||||
- int sts;
|
||||
+ int sts = -1;
|
||||
int fd; /* Fd for socket connection to pmcd */
|
||||
int port;
|
||||
int i;
|
||||
|
12
pcp-2.5.0-rpmlint.diff
Normal file
12
pcp-2.5.0-rpmlint.diff
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ur pcp-2.5.0-51/src/pmns/GNUmakefile pcp-2.5.0/src/pmns/GNUmakefile
|
||||
--- pcp-2.5.0-51/src/pmns/GNUmakefile 2005-11-29 02:41:56.000000000 +0100
|
||||
+++ pcp-2.5.0/src/pmns/GNUmakefile 2007-07-12 14:35:11.000000000 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
install: default
|
||||
$(INSTALL) -m 755 $(TARGETS) $(SCRIPTS) $(PMNS_BIN_DIR)
|
||||
$(INSTALL) -m 755 $(LOCKERS) $(PMNS_LIB_DIR)
|
||||
- $(INSTALL) -m 755 GNUmakefile.install $(PMNS_VAR_DIR)/Makefile
|
||||
+ $(INSTALL) -m 644 GNUmakefile.install $(PMNS_VAR_DIR)/Makefile
|
||||
$(INSTALL) -m 755 Rebuild4linux $(PMNS_VAR_DIR)/Rebuild
|
||||
$(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid
|
||||
$(INSTALL) -m 644 $(STDPMIDS) $(PMNS_VAR_DIR)
|
@ -1,7 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 12 16:28:26 CEST 2007 - rw@suse.de
|
||||
|
||||
- Split off development package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 30 01:24:31 CEST 2007 - ro@suse.de
|
||||
|
||||
- added procps,ncurses-devel,bison to buildreq
|
||||
- Add procps,ncurses-devel,bison to buildreq.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 16 16:20:58 CEST 2006 - schwab@suse.de
|
||||
|
40
pcp.spec
40
pcp.spec
@ -13,14 +13,15 @@
|
||||
Name: pcp
|
||||
BuildRequires: bison flex gcc-c++ ncurses-devel procps
|
||||
Version: 2.5.0
|
||||
Release: 43
|
||||
Release: 51
|
||||
Summary: Performance Co-Pilot (system-level performance monitoring)
|
||||
License: GNU General Public License (GPL)
|
||||
License: GPL v2 or later
|
||||
URL: http://oss.sgi.com/projects/pcp
|
||||
Group: System/Monitoring
|
||||
Source: pcp-%{version}.src.tar.gz
|
||||
Patch0: pcp-%{version}-SuSE.diff
|
||||
Patch1: pcp-%{version}-ndbm.diff
|
||||
Patch2: pcp-%{version}-rpmlint.diff
|
||||
PreReq: %insserv_prereq %fillup_prereq permissions
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -30,6 +31,22 @@ system-level performance monitoring and performance management.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
SGI OSS <owner-pcp@oss.sgi.com>
|
||||
|
||||
%package devel
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Group: Development/Libraries/C and C++
|
||||
License: GPL v2 or later
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description devel
|
||||
This package contains all necessary include files and libraries needed
|
||||
to develop applications that require these.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
SGI OSS <owner-pcp@oss.sgi.com>
|
||||
@ -38,6 +55,7 @@ Authors:
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%{suse_update_config -f}
|
||||
@ -85,7 +103,17 @@ $1 == "f" { if ( match ($6, "'$PCP_VAR_DIR'/config") ||
|
||||
}
|
||||
printf ("%%%%attr(%%s,root,%%s) %s\n", $2, g, $6); }
|
||||
$1 == "l" { printf "%%%%attr(-,root,root) %%s\n", $3; }
|
||||
' > files.rpm
|
||||
' | tee files-all.rpm |
|
||||
perl -e '
|
||||
open(N, "> files.rpm") || die;
|
||||
open(D, "> files-devel.rpm") || die;
|
||||
while ( <> ) {
|
||||
if ( m{(include|man3|/var/lib/pcp/(pmdas|demos))} || m{\.(c|h|so)$} ) {
|
||||
print D;
|
||||
} else {
|
||||
print N;
|
||||
}
|
||||
}'
|
||||
set -x
|
||||
|
||||
%clean
|
||||
@ -96,6 +124,8 @@ set -x
|
||||
|
||||
%files -f files.rpm
|
||||
|
||||
%files -f files-devel.rpm devel
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]
|
||||
then
|
||||
@ -216,8 +246,10 @@ fi
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Thu Jul 12 2007 - rw@suse.de
|
||||
- Split off development package.
|
||||
* Fri Mar 30 2007 - ro@suse.de
|
||||
- added procps,ncurses-devel,bison to buildreq
|
||||
- Add procps,ncurses-devel,bison to buildreq.
|
||||
* Fri Jun 16 2006 - schwab@suse.de
|
||||
- Set datadir.
|
||||
- Use RPM_OPT_FLAGS.
|
||||
|
Loading…
Reference in New Issue
Block a user