Compare commits

...

93 Commits
rawhide ... el5

Author SHA1 Message Date
Lukas Berk
64a60f89e8 Disable selinux subrpm on EL5 2017-02-28 16:52:51 -05:00
Lukas Berk
497b6510b0 Tweak selinux builddep for el5 2017-02-17 15:39:22 -05:00
Lukas Berk
8f297ec79e Merge branch 'master' into el5 2017-02-17 14:01:41 -05:00
Dave Brolley
a9a01ba204 Merge branch 'master' into el5 2016-12-21 17:13:24 -05:00
Mark Goodwin
f7f84d2cda resolve merge conflict 2016-11-16 12:45:38 +11:00
Mark Goodwin
0e73755e14 fix spec issues for el5 build 2016-09-28 10:45:00 +10:00
Mark Goodwin
c30d6ca044 Merge branch 'master' into el5 2016-09-27 21:57:49 +10:00
Nathan Scott
ed2b8cc920 Merge branch 'master' into el5 2016-08-05 14:43:01 +10:00
Nathan Scott
59b365376e No perl-devel present on el5 builds 2016-06-17 18:56:11 +10:00
Nathan Scott
ce59ccf383 Merge branch 'master' into el5 2016-06-17 17:10:37 +10:00
Lukas Berk
a890d95ac4 Change build revision back to 1 2016-04-28 21:59:35 -04:00
Lukas Berk
c16ffabca6 Merge branch 'master' into el5 2016-04-28 21:59:03 -04:00
Dave Brolley
e0c4de6d4b Merge branch 'master' into el5 2016-03-18 18:11:29 -04:00
Mark Goodwin
bfb51bd130 Merge branch 'master' into el5 2016-02-03 12:51:14 +11:00
Lukas Berk
4d2446d31a Merge branch 'master' into el5 2015-12-16 21:05:42 -05:00
Mark Goodwin
d4e2296778 Merge branch 'master' into el5 2015-10-29 21:27:09 +10:00
Nathan Scott
c8f83b1d7d Sadly el5 rpmbuild/tar cannot handle tar.gz from Mac OS X
Rebuilt the tarball for now, will chat to Martin.  Another
end-user-visible problem affecting Vector being overlooked
because of earlier pcp-webjs policy.
2015-09-17 13:52:49 +10:00
Nathan Scott
67e9068e5e Merge branch 'master' into el5 2015-09-17 13:26:00 +10:00
Nathan Scott
3e959f0576 Fix accidentally dropped spec line affecting epel5 builds 2015-08-04 14:26:31 +10:00
Nathan Scott
d9ae1b7087 Merge branch 'el5' of ssh://pkgs.fedoraproject.org/pcp into el5 2015-08-04 14:06:16 +10:00
Nathan Scott
5624ac2547 Merge branch 'master' into el5 2015-08-04 14:02:40 +10:00
Mark Goodwin
f0c40041ff remove stale patch sources 2015-06-16 10:51:13 +10:00
Mark Goodwin
01ea6110bd Update to latest community sources 2015-06-16 10:35:37 +10:00
Mark Goodwin
ebd8ed62cd Merge branch 'master' into el5 2015-06-16 08:30:14 +10:00
Nathan Scott
e9c3827553 Merge branch 'master' into el5 2015-04-16 12:29:23 +10:00
Nathan Scott
f4dbc3058d Merge branch 'master' into el5
Conflicts:
	.gitignore
	pcp.spec
	sources
2015-04-16 12:26:20 +10:00
Dave Brolley
aaa5ccc033 BuildRequires: systemtap-sdt-devel no longer conditional on !disable_python2 2015-03-02 20:14:57 -05:00
Dave Brolley
2f30c196ef New sources for PCP release 3.10.3 2015-03-02 17:34:18 -05:00
Dave Brolley
328c985d74 Add %patch macros after %setup within the %prep script. 2015-02-04 16:01:05 -05:00
Dave Brolley
aa4daafe99 Resolve python-pcp dependency. 2015-02-04 15:29:36 -05:00
Dave Brolley
03068536b5 Merge branch 'master' into el5 2015-01-26 12:53:35 -05:00
Dave Brolley
18337b0839 Remove BuildRequires: flex-devel from pcp.spec. 2015-01-26 11:34:27 -05:00
Dave Brolley
b861387474 Merge branch 'master' into el5 2015-01-23 22:22:28 -05:00
Dave Brolley
9699535103 Merge branch 'master' into el5
Conflicts:
	pcp.spec
2015-01-23 20:00:41 -05:00
Nathan Scott
002e0e6640 Disable python2 functionality for el5, py2.4 too old now 2014-12-01 17:20:33 +11:00
Nathan Scott
6c6329e989 Disable web functionality for el5, see bz 1169226 2014-12-01 16:28:12 +11:00
Nathan Scott
902c9e3fe1 Correct the cairo build dependency for el5 2014-12-01 16:11:32 +11:00
Nathan Scott
3bbc1a0c39 Merge branch 'master' into el5 2014-12-01 16:03:06 +11:00
Nathan Scott
9d5f333a4a Merge branch 'master' into el5 2014-12-01 15:49:25 +11:00
Nathan Scott
159fb25fc7 Merge branch 'master' into el5 2014-12-01 15:29:37 +11:00
Nathan Scott
48153ece57 Merge branch 'master' into el5 2014-10-31 16:48:44 +11:00
Nathan Scott
e6379ec802 No papi-devel available in EPEL5 builds 2014-09-05 17:19:54 +10:00
Nathan Scott
56a41fa5d5 Merge branch 'master' into el5 2014-09-05 17:19:25 +10:00
Nathan Scott
95676ed0da Merge branch 'master' into el5 2014-09-05 14:46:05 +10:00
Nathan Scott
d1782208c2 Merge branch 'master' into el5 2014-08-13 15:50:46 +10:00
Nathan Scott
cd2abcb068 Merge branch 'el5' of ssh://pkgs.fedoraproject.org/pcp into el5 2014-08-13 15:49:02 +10:00
Mark Goodwin
f40216eb2b Update to latest community sources 2014-07-16 14:04:48 +10:00
Dave Brolley
f7ef454d0b pcp.spec: DOn't process pcp-gui.list if %{disable_qt}. 2014-06-18 16:05:42 -04:00
Dave Brolley
a1b5c2bbb2 pcp.spec: Don't process %{_pixmapdir} if %{disable_qt} 2014-06-18 15:51:28 -04:00
Dave Brolley
1cea39f7c2 Remove 'BuildArch: noarch' from pcp-doc package. 2014-06-18 14:53:15 -04:00
Dave Brolley
3b68f81768 Merge branch 'master' into el5 2014-06-18 13:01:55 -04:00
Nathan Scott
e2615f5281 Merge branch 'master' into el5 2014-05-15 15:41:04 +10:00
Dave Brolley
2b0b266766 Improve pmdarpm(1) concurrency complications (BZ 1044297)
- Fix pmconfig(1) shell output string quoting (BZ 1085401)
- Update to latest PCP sources.
2014-04-15 15:30:29 -04:00
Dave Brolley
fb860ceb0d Merge branch 'master' into el5
Conflicts:
	pcp.spec
2014-04-15 15:27:36 -04:00
Frank Ch. Eigler
d8cea85ff8 rhel5 build fix, backporting upstream commit 23dfcd456 2014-03-23 17:30:43 -04:00
Nathan Scott
5b46b95225 Merge branch 'master' into el5 2014-03-20 09:43:34 +11:00
Nathan Scott
5b298eef4b Merge branch 'master' into el5 2014-02-20 13:38:21 +11:00
Nathan Scott
afe4c05ccb Merge branch 'master' into el5 2014-01-29 14:56:46 +11:00
Nathan Scott
a6342b0e50 Merge branch 'master' into el5 2014-01-29 12:52:01 +11:00
Nathan Scott
b628073247 Merge branch 'master' into el5 2014-01-15 11:02:33 +11:00
Nathan Scott
ee01517ceb Merge branch 'master' into el5 2013-12-12 16:07:21 +11:00
Nathan Scott
80e3ea7976 Merge branch 'master' into el5 2013-11-01 14:26:09 +11:00
Nathan Scott
dde4a36d3b Merge branch 'master' into el5 2013-10-18 09:56:05 +11:00
Nathan Scott
ce2de4204f Merge branch 'master' into el5 2013-09-16 17:35:28 +10:00
Nathan Scott
65b4e0ae2b Merge branch 'master' into el5 2013-09-15 17:55:38 +10:00
Stan Cox
a3e623e679 Disable pmcd.stp on el5 ppc. 2013-09-11 16:54:26 -04:00
Frank Ch. Eigler
d24730a35f disable sys/sdt.h on ppc; absent for some reason 2013-09-09 10:07:22 -04:00
Nathan Scott
3398847799 Merge branch 'master' into el5 2013-09-09 21:57:57 +10:00
Nathan Scott
990a83314d Merge branch 'master' into el5 2013-07-31 14:05:21 +10:00
Nathan Scott
b6b3851178 Merge branch 'master' into el5 2013-07-31 12:41:19 +10:00
Nathan Scott
79f16a7099 Merge branch 'master' into el5 2013-06-19 13:45:54 +10:00
Nathan Scott
e00e99b127 Merge branch 'master' into el5 2013-05-14 16:38:46 +10:00
Nathan Scott
b918b2ca60 Merge branch 'master' into el5 2013-04-19 17:09:28 +10:00
Nathan Scott
7c9b516782 Merge branch 'master' into el5 2013-03-26 09:54:00 +11:00
Nathan Scott
cbeeb71983 Merge branch 'master' into el5 2013-03-20 14:41:42 +11:00
Nathan Scott
fa9fef9b22 Merge branch 'master' into el5 2013-03-11 13:01:57 +11:00
Nathan Scott
116b46c8bd Merge branch 'master' into el5 2012-11-28 16:13:30 +11:00
Nathan Scott
04ad0f9593 Merge branch 'master' into el5 2012-11-19 15:30:24 +11:00
Nathan Scott
049731523a Merge branch 'master' into el5 2012-10-14 11:13:47 +11:00
Nathan Scott
280536e903 Merge branch 'master' into el5 2012-09-14 22:26:05 +10:00
Nathan Scott
1c2a6fee52 Merge branch 'master' into el5 2012-09-14 21:54:55 +10:00
Nathan Scott
7a106771ae Merge branch 'master' into el5 2012-09-05 14:46:22 +10:00
Mark Goodwin
42ee5ae076 Merge branch 'master' into el5 2012-08-28 20:55:48 +10:00
Mark Goodwin
4089f09dcc Merge branch 'master' into el5 2012-08-16 16:24:17 +10:00
Mark Goodwin
52027a6b0d Merge branch 'master' into el5 2012-07-19 16:18:05 +10:00
Mark Goodwin
2e2a2d1b7f Merge branch 'master' into el5 2012-06-22 13:18:42 +10:00
Mark Goodwin
66c4e9aaba Merge branch 'master' into el5 2012-05-02 22:51:12 +10:00
Mark Goodwin
4eefb6df41 Merge branch 'master' into el5 2011-12-15 15:31:45 +11:00
Mark Goodwin
f90cfb7670 fix .gitignore 2011-12-12 20:11:56 +11:00
Mark Goodwin
7d0c6db530 Update to 3.5.11-1 2011-12-12 20:02:34 +11:00
Fedora Release Engineering
fe272613fd dist-git conversion 2010-07-29 05:38:30 +00:00
Mark Goodwin
2fd74a0b55 - initial import of 3.3.3-1 sources 2010-07-20 01:25:51 +00:00
Jason ティビツ
96546f0067 Initialize branch EL-5 for pcp 2010-06-26 06:53:35 +00:00

View File

@ -1,7 +1,7 @@
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
Name: pcp Name: pcp
Version: 3.11.8 Version: 3.11.8
%global buildversion 1 %global buildversion 2
Release: %{buildversion}%{?dist} Release: %{buildversion}%{?dist}
License: GPLv2+ and LGPLv2.1+ and CC-BY License: GPLv2+ and LGPLv2.1+ and CC-BY
@ -15,7 +15,7 @@ Source1: vector-1.1.0.tar.gz
Source2: pcp-webjs-3.11.8.src.tar.gz Source2: pcp-webjs-3.11.8.src.tar.gz
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} > 5
%global disable_selinux 0 %global disable_selinux 0
%else %else
%global disable_selinux 1 %global disable_selinux 1
@ -1796,7 +1796,11 @@ Group: Applications/System
Summary: Selinux policy package Summary: Selinux policy package
URL: http://www.pcp.io URL: http://www.pcp.io
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
%if 0%{?rhel} == 5
BuildRequires: setools
%else
BuildRequires: setools-console BuildRequires: setools-console
%endif
Requires: policycoreutils Requires: policycoreutils
Requires: pcp = %{version}-%{release} Requires: pcp = %{version}-%{release}
@ -2361,9 +2365,9 @@ chown -R pcp:pcp %{_logsdir}/pmmgr 2>/dev/null
%if !%{disable_selinux} %if !%{disable_selinux}
%post selinux %post selinux
%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 %if 0%{?fedora} >= 24 || 0%{?rhel} > 6
semodule -X 400 -i %{localstatedir}/lib/pcp/selinux/pcpupstream.pp semodule -X 400 -i %{_selinuxdir}/pcpupstream.pp
%else %else
semodule -i %{localstatedir}/lib/pcp/selinux/pcpupstream.pp semodule -i %{_selinuxdir}/pcpupstream.pp
%endif #distro version check %endif #distro version check
%endif %endif
@ -2428,11 +2432,14 @@ cd
%if !%{disable_selinux} %if !%{disable_selinux}
%preun selinux %preun selinux
if [ `semodule -l | grep pcpupstream` ]
then
%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 %if 0%{?fedora} >= 24 || 0%{?rhel} > 6
semodule -X 400 -r pcpupstream >/dev/null semodule -X 400 -r pcpupstream >/dev/null
%else %else
semodule -r pcpupstream >/dev/null semodule -r pcpupstream >/dev/null
%endif %endif
fi
%endif %endif
%files -f base.list %files -f base.list
# #
@ -2882,6 +2889,9 @@ cd
%endif %endif
%changelog %changelog
* Tue Feb 28 2017 Lukas Berk <lberk@redhat.com> - 3.11.8-2
- Disable selinux subrpm on EL5
* Fri Feb 17 2017 Lukas Berk <lberk@redhat.com> - 3.11.8-1 * Fri Feb 17 2017 Lukas Berk <lberk@redhat.com> - 3.11.8-1
- Support newer kernels /proc/vmstat file contents (BZ 1396148) - Support newer kernels /proc/vmstat file contents (BZ 1396148)
- Added pcp-selinux policy (BZs 1214090, 1381127, 1337968, 1398147) - Added pcp-selinux policy (BZs 1214090, 1381127, 1337968, 1398147)