commit 56d4fe79a95cc7be2d0ec5c6331d8a78e6a38aa5 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sat Jul 1 11:24:21 2017 +0200
- fix detection of latest systemd - rel 15 pcp.spec | 4 +++- systemd.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/pcp.spec b/pcp.spec index ed26896..35ba26d 100644 --- a/pcp.spec +++ b/pcp.spec @@ -13,7 +13,7 @@ Summary: Performance Co-Pilot - system level performance monitoring and manageme Summary(pl.UTF-8): Performance Co-Pilot - monitorowanie i zarządzanie wydajnością na poziomie systemu Name: pcp Version: 3.10.0 -Release: 14 +Release: 15 License: LGPL v2.1 (libraries), GPL v2 (the rest) Group: Applications/System Source0: ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.src.tar.gz @@ -24,6 +24,7 @@ Patch2: %{name}-nspr.patch Patch3: %{name}-saslconfdir.patch Patch4: %{name}-rpm.patch Patch5: python-install.patch +Patch6: systemd.patch URL: http://oss.sgi.com/projects/pcp/ BuildRequires: autoconf >= 2.60 BuildRequires: avahi-devel @@ -224,6 +225,7 @@ Sondy systemtap/dtrace dla PCP. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %{__autoconf} diff --git a/systemd.patch b/systemd.patch new file mode 100644 index 0000000..6296207 --- /dev/null +++ b/systemd.patch @@ -0,0 +1,11 @@ +--- pcp-3.10.0/configure.ac~ 2017-07-01 10:57:29.000000000 +0200 ++++ pcp-3.10.0/configure.ac 2017-07-01 11:11:40.955209598 +0200 +@@ -1216,7 +1216,7 @@ + fi + AC_SUBST(lib_for_regex) + +-PKG_CHECK_MODULES([SYSTEMD], [libsystemd-journal], ++PKG_CHECK_MODULES([SYSTEMD], [libsystemd], + [pmda_systemd=true], [pmda_systemd=false]) + AC_SUBST(PMDA_SYSTEMD, $pmda_systemd) + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pcp.git/commitdiff/56d4fe79a95cc7be2d0ec5c6331d8a78e6a38aa5 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit