From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 27 Feb 2022 00:05:56 +0000 (+0100)
Subject: - merged PLD changes, more systemd macros to nullify
X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-tld-macros.git;a=commitdiff_plain;h=d37e647b8b3e05d3b062c9de9a86b19cdfc60740

- merged PLD changes, more systemd macros to nullify
---

diff --git a/macros.go b/macros.go
index 07efe21..a310a5c 100644
--- a/macros.go
+++ b/macros.go
@@ -1,4 +1,5 @@
 %go_arches	%{ix86} %{x8664} %{armv5} %{armv6} %{armv7} aarch64 mips mipsel mips64 mips64le ppc64 ppc64le riscv64 s390x
+%go_cachedir		%{?buildsubdir:%{_builddir}/%{buildsubdir}/}.go-cache
 
 %__go	\\\
 %ifarch aarch64 \
@@ -31,5 +32,7 @@
 %ifarch mips mips64 ppc64 ppc64le riscv64 s390x \
 	GOARCH=${GOARCH-%{_arch}} \\\
 %endif \
+	%{?go_cachedir:GOCACHE="%{go_cachedir}"} \\\
+	%{?__jobs:GOMAXPROCS=%{__jobs}} \\\
 	GOOS=${GOOS-linux} \\\
 	/usr/bin/go
diff --git a/macros.systemd b/macros.systemd
index 1fbb247..52d598c 100644
--- a/macros.systemd
+++ b/macros.systemd
@@ -10,7 +10,11 @@
 %systemd_service_reload() %{nil}
 %systemd_trigger() %{nil}
 %systemd_post() %{nil}
+%systemd_user_post %{nil}
 %systemd_preun() %{nil}
+%systemd_user_preun %{nil}
+%systemd_postun() %{nil}
+%systemd_user_postun() %{nil}
 
 # Keep paths for systemd related files
 %systemdunitdir /lib/systemd/system
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 386eee8..8f3b07a 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:	6
+Release:	7
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld