Compare commits
93 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
64a60f89e8 | ||
|
497b6510b0 | ||
|
8f297ec79e | ||
|
a9a01ba204 | ||
|
f7f84d2cda | ||
|
0e73755e14 | ||
|
c30d6ca044 | ||
|
ed2b8cc920 | ||
|
59b365376e | ||
|
ce59ccf383 | ||
|
a890d95ac4 | ||
|
c16ffabca6 | ||
|
e0c4de6d4b | ||
|
bfb51bd130 | ||
|
4d2446d31a | ||
|
d4e2296778 | ||
|
c8f83b1d7d | ||
|
67e9068e5e | ||
|
3e959f0576 | ||
|
d9ae1b7087 | ||
|
5624ac2547 | ||
|
f0c40041ff | ||
|
01ea6110bd | ||
|
ebd8ed62cd | ||
|
e9c3827553 | ||
|
f4dbc3058d | ||
|
aaa5ccc033 | ||
|
2f30c196ef | ||
|
328c985d74 | ||
|
aa4daafe99 | ||
|
03068536b5 | ||
|
18337b0839 | ||
|
b861387474 | ||
|
9699535103 | ||
|
002e0e6640 | ||
|
6c6329e989 | ||
|
902c9e3fe1 | ||
|
3bbc1a0c39 | ||
|
9d5f333a4a | ||
|
159fb25fc7 | ||
|
48153ece57 | ||
|
e6379ec802 | ||
|
56a41fa5d5 | ||
|
95676ed0da | ||
|
d1782208c2 | ||
|
cd2abcb068 | ||
|
f40216eb2b | ||
|
f7ef454d0b | ||
|
a1b5c2bbb2 | ||
|
1cea39f7c2 | ||
|
3b68f81768 | ||
|
e2615f5281 | ||
|
2b0b266766 | ||
|
fb860ceb0d | ||
|
d8cea85ff8 | ||
|
5b46b95225 | ||
|
5b298eef4b | ||
|
afe4c05ccb | ||
|
a6342b0e50 | ||
|
b628073247 | ||
|
ee01517ceb | ||
|
80e3ea7976 | ||
|
dde4a36d3b | ||
|
ce2de4204f | ||
|
65b4e0ae2b | ||
|
a3e623e679 | ||
|
d24730a35f | ||
|
3398847799 | ||
|
990a83314d | ||
|
b6b3851178 | ||
|
79f16a7099 | ||
|
e00e99b127 | ||
|
b918b2ca60 | ||
|
7c9b516782 | ||
|
cbeeb71983 | ||
|
fa9fef9b22 | ||
|
116b46c8bd | ||
|
04ad0f9593 | ||
|
049731523a | ||
|
280536e903 | ||
|
1c2a6fee52 | ||
|
7a106771ae | ||
|
42ee5ae076 | ||
|
4089f09dcc | ||
|
52027a6b0d | ||
|
2e2a2d1b7f | ||
|
66c4e9aaba | ||
|
4eefb6df41 | ||
|
f90cfb7670 | ||
|
7d0c6db530 | ||
|
fe272613fd | ||
|
2fd74a0b55 | ||
|
96546f0067 |
18
pcp.spec
18
pcp.spec
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user