From eca01bf36380d411e1b3b4613ab87996c7ca199b Mon Sep 17 00:00:00 2001
From: zhuchunyi <zhuchunyi@huawei.com>
Date: Wed, 6 Nov 2019 19:04:37 +0800
Subject: [PATCH] update code

---
 cockpit.spec | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index e3c3b80..7744e83 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,6 +1,7 @@
+%bcond_with pcp
 Name:           cockpit
 Version:        178
-Release:        4
+Release:        5
 Summary:        A easy-to-use, integrated, glanceable, and open web-based interface for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
@@ -9,7 +10,11 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 BuildRequires:  pkgconfig(gio-unix-2.0) pkgconfig(json-glib-1.0) pkgconfig(polkit-agent-1) >= 0.105 pam-devel
 BuildRequires:  autoconf automake python3 intltool libssh-devel >= 0.7.1 openssl-devel zlib-devel krb5-devel
 BuildRequires:  libxslt-devel docbook-style-xsl glib-networking sed glib2-devel >= 2.37.4
-BuildRequires:  systemd-devel pcp-libs-devel krb5-server gdb xmlto
+BuildRequires:  systemd-devel krb5-server gdb xmlto
+
+%if %{with pcp}
+BuildRequires: pcp-libs-devel
+%endif
 
 Requires:       glib-networking shadow-utils grep libpwquality coreutils NetworkManager kexec-tools openssl glib2 >= 2.37.4
 Requires:       python3 python3-dbus systemd udisks2 >= 2.6 libvirt libvirt-client PackageKit
@@ -19,7 +24,6 @@ Provides:       %{name}-machines = %{version}-%{release} %{name}-machines-ovirt
 Provides:       %{name}-bridge = %{version}-%{release} %{name}-packagekit = %{version}-%{release} %{name}-storaged = %{version}-%{release}
 Provides:       %{name}-system = %{version}-%{release} %{name}-ws = %{version}-%{release} %{name}-ssh %{name}-realmd
 Provides:       %{name}-tuned %{name}-users %{name}-kdump
-
 Provides:       bundled(js-jquery) = 3.3.1 bundled(js-moment) = 2.22.2 bundled(nodejs-flot) = 0.8.3 bundled(xstatic-patternfly-common) = 3.35.1
 Provides:       bundled(nodejs-promise) = 8.0.2 bundled(nodejs-requirejs) = 2.1.22 bundled(xstatic-bootstrap-datepicker-common) = 1.8.0
 
@@ -38,6 +42,7 @@ Recommends:     udisks2-lvm2 >= 2.6 udisks2-iscsi >= 2.6 device-mapper-multipath
 Cockpit makes GNU/Linux discoverable. See Linux server in a web browser and perform system tasks with a mouse.
 It’s easy to start containers, administer storage, configure networks, and inspect logs with this package.
 
+%if %{with pcp}
 %package pcp
 Summary: Cockpit PCP integration
 Requires: cockpit-bridge >= 134.x
@@ -45,6 +50,7 @@ Requires: pcp
 
 %description pcp
 Cockpit support for reading PCP metrics and loading PCP archives.
+%endif
 
 %package devel
 Summary:        Test suite for %{name}
@@ -74,7 +80,11 @@ man help files.
 
 %build
 %configure --disable-silent-rules --with-cockpit-user=cockpit-ws --with-selinux-config-type=etc_t\
-  --with-appstream-data-packages='[ "appstream-data" ]' --with-nfs-client-package='"nfs-utils"' --with-vdo-package='"vdo"'
+  --with-appstream-data-packages='[ "appstream-data" ]' --with-nfs-client-package='"nfs-utils"' --with-vdo-package='"vdo"' \
+%if %{without pcp}
+  --disable-pcp
+%endif
+
 %make_build
 
 %check
@@ -103,8 +113,10 @@ getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/no
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 # cannot use systemctl because it might be out of sync with reality
 
+%if %{with pcp}
 %post pcp
 /usr/share/pcp/lib/pmlogger condrestart
+%endif
 
 %preun
 %systemd_preun cockpit.socket
@@ -114,7 +126,9 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 %systemd_postun_with_restart cockpit.service
 
 %files -f %{name}.lang
-%exclude %{_libdir}/%{name}/*.so
+%if %{without pcp}
+%exclude %{_datadir}/cockpit/pcp/*
+%endif
 %exclude %{_prefix}/lib/firewalld/services/cockpit.xml
 %exclude %{_datadir}/%{name}/{subscriptions,docker,kubernetes}
 %exclude %{_datadir}/pixmaps/cockpit-sosreport.png
@@ -141,10 +155,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 %{_sbindir}/remotectl
 %{_bindir}/cockpit-bridge
 
-%files pcp 
+%if %{with pcp}
+%files pcp
 %{_datadir}/cockpit/pcp/*
 %{_libexecdir}/cockpit-pcp
 %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit
+%endif
 
 %files devel
 %config(noreplace) %{_sysconfdir}/cockpit/cockpit.conf
@@ -159,6 +175,12 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 %doc %{_mandir}/man8/{cockpit-ws.8.gz,remotectl.8.gz,pam_ssh_add.8.gz}
 
 %changelog
+* Mon Oct 28 2019 caomeng <caomeng5@huawei.com> - 178-5
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:add bcondwith pcp
+
 * Wed Sep 25 2019 huzhiyu<huzhiyu1@huawei.com> - 178-4
 - Type:bugfix
 - Id:NA