automatic version update by autodist [release 4.0.4-1mamba;Fri Sep 01 2023]

This commit is contained in:
Automatic Build System 2024-01-06 10:32:27 +01:00
parent 158daae442
commit 193e82d23c
2 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From ca004d4657d5e8b468a4552ede429be53193a3a9 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@dropbear.xyz>
Date: Thu, 31 Aug 2023 22:24:23 +1000
Subject: build-sys: Add systemd/elogind to w
Depending on the compiler flags, w needs to be explictly linked
to libsystemd or elogind even though libproc2 is linked to it.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
---
Makefile.am | 7 +++++++
NEWS | 3 +++
2 files changed, 10 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index f70c8fb1..ddfc0141 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,13 @@ endif
dist_man_MANS += man/w.1
src_w_SOURCES = src/w.c local/fileutils.c
+src_w_LDADD = $(LDADD)
+if WITH_SYSTEMD
+src_w_LDADD += @SYSTEMD_LIBS@
+endif
+if WITH_ELOGIND
+src_w_LDADD += @ELOGIND_LIBS@
+endif
else
EXTRA_DIST += man/w.1
endif
diff --git a/NEWS b/NEWS
index 3f2158d4..4ad9f74e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+procps-ng-NEXT
+---------------
+
procps-ng-4.0.4
---------------
* library (API & ABI unchanged)

View File

@ -1,5 +1,5 @@
Name: procps-ng Name: procps-ng
Version: 4.0.3 Version: 4.0.4
Release: 1mamba Release: 1mamba
Summary: Command line and full screen utilities for browsing procfs Summary: Command line and full screen utilities for browsing procfs
Group: System/Tools Group: System/Tools
@ -10,6 +10,7 @@ URL: https://sourceforge.net/projects/procps-ng
Source: http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-%{version}.tar.xz Source: http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-%{version}.tar.xz
Patch0: procps-3.2.8-sysinfo_7numbers.patch Patch0: procps-3.2.8-sysinfo_7numbers.patch
Patch1: procps-3.2.8-kernel-3.0.patch Patch1: procps-3.2.8-kernel-3.0.patch
Patch2: procps-ng-4.0.4-add-systemd-elogind-to-w.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -51,6 +52,9 @@ This package contains libraries and header files for developing applications tha
#./autogen.sh #./autogen.sh
#%patch0 -p1 #%patch0 -p1
#%patch1 -p1 #%patch1 -p1
%patch 2 -p1 -b .add-systemd-elogind-to-w
autoreconf -f -i
%build %build
%configure \ %configure \
@ -111,6 +115,9 @@ This package contains libraries and header files for developing applications tha
%doc NEWS %doc NEWS
%changelog %changelog
* Fri Sep 01 2023 Automatic Build System <autodist@mambasoft.it> 4.0.4-1mamba
- automatic version update by autodist
* Tue Aug 08 2023 Automatic Build System <autodist@mambasoft.it> 4.0.3-1mamba * Tue Aug 08 2023 Automatic Build System <autodist@mambasoft.it> 4.0.3-1mamba
- automatic version update by autodist - automatic version update by autodist