Fix FTBFS with new systemd
This commit is contained in:
parent
e6a127c754
commit
7b0213a3bc
37
procps-ng-3.3.10-libsystemd.patch
Normal file
37
procps-ng-3.3.10-libsystemd.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 4e7f42375a9aa860365e6007a53a357df60964f1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Craig Small <csmall@enc.com.au>
|
||||||
|
Date: Thu, 9 Jul 2015 22:12:10 +1000
|
||||||
|
Subject: [PATCH] build-sys: use merged systemd library
|
||||||
|
|
||||||
|
Since systemd 209 released in Feb 2014 three systemd libraries
|
||||||
|
including systemd-login have been merged. This change merely
|
||||||
|
checks for, and links to, the new library.
|
||||||
|
|
||||||
|
References:
|
||||||
|
http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
|
||||||
|
https://bugs.debian.org/731256
|
||||||
|
---
|
||||||
|
configure.ac | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 612097f..48d4a59 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -150,10 +150,10 @@ AC_ARG_WITH([systemd],
|
||||||
|
[], [with_systemd=no]
|
||||||
|
)
|
||||||
|
if test "x$with_systemd" != xno; then
|
||||||
|
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login >= 206], [], [
|
||||||
|
- AC_CHECK_LIB(systemd-login, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
|
||||||
|
+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [], [
|
||||||
|
+ AC_CHECK_LIB(systemd, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
|
||||||
|
if test "x$have_systemd" = xno; then
|
||||||
|
- AC_MSG_ERROR([systemd support missing/incomplete (requires >= 206)])
|
||||||
|
+ AC_MSG_ERROR([systemd support missing/incomplete (requires >= 209)])
|
||||||
|
fi
|
||||||
|
SYSTEMD_LIBS="-lsystemd-login"
|
||||||
|
])
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
Summary: System and process monitoring utilities
|
Summary: System and process monitoring utilities
|
||||||
Name: procps-ng
|
Name: procps-ng
|
||||||
Version: 3.3.10
|
Version: 3.3.10
|
||||||
Release: 11%{?dist}
|
Release: 12%{?dist}
|
||||||
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
|
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: https://sourceforge.net/projects/procps-ng/
|
URL: https://sourceforge.net/projects/procps-ng/
|
||||||
@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
|||||||
|
|
||||||
Patch0: procps-ng-3.3.10-top-fix-deep-forking-forest-crash.patch
|
Patch0: procps-ng-3.3.10-top-fix-deep-forking-forest-crash.patch
|
||||||
Patch1: procps-ng-3.3.10-find_elf_note-memory-error-fix.patch
|
Patch1: procps-ng-3.3.10-find_elf_note-memory-error-fix.patch
|
||||||
|
Patch2: procps-ng-3.3.10-libsystemd.patch
|
||||||
|
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(postun): /sbin/ldconfig
|
||||||
@ -89,6 +90,7 @@ Internationalization pack for procps-ng
|
|||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# The following stuff is needed for git archives only
|
# The following stuff is needed for git archives only
|
||||||
@ -162,6 +164,9 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
|
|||||||
%files i18n -f %{name}.lang
|
%files i18n -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 28 2016 Lubomir Rintel - 3.3.10-12
|
||||||
|
- Fix FTBFS with new systemd
|
||||||
|
|
||||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.10-11
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.10-11
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user