From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 29 Apr 2020 23:37:37 +0000 (+0200)
Subject: - remove tmpfiles.d checks, there is no systemd in TLD Linux
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=77d8583b546d2c368b3c4f6b8e12ba9649066d1d;p=packages%2Frpm-tld-macros.git

- remove tmpfiles.d checks, there is no systemd in TLD Linux
---

diff --git a/macros.tld b/macros.tld
index 5f218ad..2d0e896 100644
--- a/macros.tld
+++ b/macros.tld
@@ -775,28 +775,12 @@ __spec_install_post_check_execstack() { \
 }; __spec_install_post_check_execstack }}
 
 #-----------------------------------------------------------------
-# Verify that for each directory under /var/run package contains
-# tmpfiles.d configuration. Warn and terminate build if config is
-# missing.
+# Do not verify if each directory under /var/run contains
+# tmpfiles.d configuration. TLD Linux doesn't use tmpfiles.d.
 #
-#%no_install_post_check_tmpfiles 1
+%no_install_post_check_tmpfiles 1
 #
-%__spec_install_post_check_tmpfiles { \
-__spec_install_post_check_tmpfiles() { \
-%{!?debug:set +x;} \
-	fail=0; \
-	echo "Checking /var/run <-> tmpfiles.d completeness..."; \
-	for d in $RPM_BUILD_ROOT/var/run/*; do \
-		[ -d "$d" ] || continue; \
-		d=${d##$RPM_BUILD_ROOT}; \
-		if ! grep -qsF "$d" $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/*.conf $RPM_BUILD_ROOT/etc/tmpfiles.d/*.conf; then\
-			echo "No tmpfiles configuration for '$d'";\
-			fail=1 ; \
-		fi \
-	done ; \
-	echo " DONE"; \
-	%{!?no_install_post_check_tmpfiles:return $fail;} \
-}; __spec_install_post_check_tmpfiles }}
+%__spec_install_post_check_tmpfiles %{nil}
 
 #-----------------------------------------------------------------
 # Verify that scripts have reasonable shebangs
@@ -1176,9 +1160,6 @@ fi;
 # calls usual service restart on package %post, but skips the restart if
 # administrator has disabled automatic service restarts in either global
 # /etc/sysconfig/rpm or per service /etc/sysconfig/SERVICE file.
-# NOTE: systemd_booted machines do not print
-#		Run "{command}" to restart {service}.
-# message for packages without native systemd unit (not here, no %systemd_post).
 #
 # Usage:
 #   %service [-q] [-n] SERVICE ACTION ["SERVICE NICE DESCRIPTION"]
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 0ee9bfd..e48208c 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -6,7 +6,7 @@ Summary:	TLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa TLD
 Name:		rpm-tld-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld