[packages/util-linux] - added systemd bcond to allow building without BR systemd dependency note: only files affected by

hawk hawk at pld-linux.org
Sun Mar 21 14:46:42 CET 2021


commit 0deefbb8c7e83c1353d80cb17c11064249ff48e2
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Mar 21 13:45:45 2021 +0000

    - added systemd bcond to allow building without BR systemd dependency
      note: only files affected by --without-systemd configure flag are
      excluded by bcond

 util-linux.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 173d5b1..d173142 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -14,6 +14,7 @@
 %bcond_without	dietlibc	# link initrd version with dietlibc instead of uClibc
 %bcond_without	selinux		# SELinux support
 %bcond_without	su		# su/runuser programs
+%bcond_without	systemd		# systemd
 %if "%{pld_release}" == "ac"
 %bcond_with	initrd		# don't build initrd version
 %bcond_with	fallocate	# fallocate utility (needs glibc 2.11 to compile)
@@ -91,7 +92,7 @@ BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
-BuildRequires:	systemd-devel >= 1:209
+%{?with_systemd:BuildRequires:	systemd-devel >= 1:209}
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
 BuildRequires:	xz
@@ -867,7 +868,9 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 	--with-bashcompletiondir=/usr/share/bash-completion/completions \
 	--with-selinux%{!?with_selinux:=no} \
 	--with-smack \
-	--with-readline
+	--with-readline \
+	%{!?with_systemd:--without-systemd}
+
 
 %{__make}
 
@@ -1177,8 +1180,10 @@ fi
 %attr(755,root,root) %{_sbindir}/rfkill
 %attr(755,root,root) %{_sbindir}/rtcwake
 
+%if %{with systemd}
 %{systemdunitdir}/fstrim.service
 %{systemdunitdir}/fstrim.timer
+%endif
 
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/choom.1*
@@ -1585,8 +1590,10 @@ fi
 %attr(6755,uuidd,uuidd) %{_sbindir}/uuidd
 %attr(2775,uuidd,uuidd) /var/lib/libuuid
 %{_mandir}/man8/uuidd.8*
+%if %{with systemd}
 %{systemdunitdir}/uuidd.service
 %{systemdunitdir}/uuidd.socket
+%endif
 
 %files -n libfdisk
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/0deefbb8c7e83c1353d80cb17c11064249ff48e2



More information about the pld-cvs-commit mailing list