Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2018-08-15 10:32:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp" Wed Aug 15 10:32:14 2018 rev:43 rq:627824 version:3.11.9 Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2017-11-29 10:51:52.274367038 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2018-08-15 10:32:16.575625356 +0200 @@ -1,0 +2,7 @@ +Mon Aug 6 09:30:46 UTC 2018 - [email protected] + +- sysmacros.patch: Include <sys/sysmacros.h> for major/minor/makedev +- Use %license for COPYING +- Don't exclude post-build-checks + +------------------------------------------------------------------- New: ---- sysmacros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.qQercU/_old 2018-08-15 10:32:17.607627221 +0200 +++ /var/tmp/diff_new_pack.qQercU/_new 2018-08-15 10:32:17.611627228 +0200 @@ -1,7 +1,7 @@ # # spec file for package pcp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,6 @@ %define _fillupdir /var/adm/fillup-templates %endif -BuildRequires: -post-build-checks - %if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14 %global has_systemd 1 %else @@ -72,7 +70,7 @@ %global libpcp_web_sover 1 Summary: System-level performance monitoring and performance management -License: %{license_gplv2plus} and %{license_lgplv2plus} and %{license_cc_by} +License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by} Group: %{pcp_gr} Name: pcp Version: 3.11.9 @@ -99,6 +97,8 @@ Patch8: 0008-SUSE-fy-pmsnap-control-path.patch # PATCH-FIX-OPENSUSE, [email protected] Patch9: 0009-pmsnap-control-var-www-srv-www.patch +# PATCH-FIX-UPSTREAM Include <sys/sysmacros.h> for major/minor/makedev +Patch10: sysmacros.patch %if 0%{?fedora} || 0%{?rhel} %global disable_selinux 0 @@ -504,7 +504,7 @@ # %package -n %{lib_devel_pkg} Summary: Performance Co-Pilot (PCP) development headers -License: %{license_gplv2plus} and %{license_lgplv21plus} +License: %{license_gplv2plus} AND %{license_lgplv21plus} Group: %{lib_devel_gr} Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} @@ -522,7 +522,7 @@ # %package devel Summary: Performance Co-Pilot (PCP) development tools and documentation -License: %{license_gplv2plus} and %{license_lgplv21plus} +License: %{license_gplv2plus} AND %{license_lgplv21plus} Group: %{lib_devel_gr} Url: http://www.pcp.io %if !0%{?suse_version} @@ -539,7 +539,7 @@ # %package testsuite Summary: Performance Co-Pilot (PCP) test suite -License: %{license_gplv2plus} and %{license_mit} +License: %{license_gplv2plus} AND %{license_mit} Group: %{lib_devel_gr} Url: http://www.pcp.io %if !0%{?suse_version} @@ -2044,7 +2044,7 @@ # %package gui Summary: Visualization tools for the Performance Co-Pilot toolkit -License: %{license_gplv2plus} and %{license_lgplv2plus} +License: %{license_gplv2plus} AND %{license_lgplv2plus} Group: Applications/System Url: http://www.pcp.io %if !0%{?suse_version} @@ -2066,7 +2066,7 @@ BuildArch: noarch %endif Summary: Documentation and tutorial for the Performance Co-Pilot -License: %{license_gplv2plus} and %{license_cc_by} +License: %{license_gplv2plus} AND %{license_cc_by} Group: Documentation Url: http://www.pcp.io # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" @@ -2091,7 +2091,7 @@ %if !%{disable_selinux} %package selinux Summary: Selinux policy package -License: %{license_gplv2plus} and %{license_cc_by} +License: %{license_gplv2plus} AND %{license_cc_by} Group: Applications/System Url: http://www.pcp.io BuildRequires: selinux-policy-devel @@ -2118,6 +2118,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 autoconf @@ -2743,7 +2744,8 @@ # but rather they are (slightly obscure) PMDA config files. # %defattr(-,root,root) -%doc CHANGELOG COPYING INSTALL.md README.md VERSION.pcp pcp.lsm +%doc CHANGELOG INSTALL.md README.md VERSION.pcp pcp.lsm +%license COPYING %if 0%{?suse_version} %exclude %{_docdir}/pcp/demos %exclude %{_docdir}/pcp/examples ++++++ sysmacros.patch ++++++ Index: pcp-3.11.9/src/pmdas/gfs2/pmda.c =================================================================== --- pcp-3.11.9.orig/src/pmdas/gfs2/pmda.c +++ pcp-3.11.9/src/pmdas/gfs2/pmda.c @@ -22,6 +22,7 @@ #include "pmdagfs2.h" #include <sys/types.h> +#include <sys/sysmacros.h> #include <ctype.h> static char *gfs2_sysfsdir = "/sys/kernel/debug/gfs2";
