- merged PLD changes, more systemd macros to nullify

diff --git a/macros.go b/macros.go
index 07efe21cd35d31d75562f9c886413f966ca53769..a310a5c983df967a4db2c4b1ca6e0ac9d92ce216 100644 (file)
--- 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_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 \
 
 %__go  \\\
 %ifarch aarch64 \


@@ -31,5 +32,7 @@
 %ifarch mips mips64 ppc64 ppc64le riscv64 s390x \
        GOARCH=${GOARCH-%{_arch}} \\\
 %endif \
 %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
        GOOS=${GOOS-linux} \\\
        /usr/bin/go

diff --git a/macros.systemd b/macros.systemd
index 1fbb2473130411c28fee3d59da1bd839d7a7ed45..52d598c5e6654601946b4de9d3c50de68b738810 100644 (file)
--- a/macros.systemd
+++ b/macros.systemd
@@ -10,7 +10,11 @@
 %systemd_service_reload() %{nil}
 %systemd_trigger() %{nil}
 %systemd_post() %{nil}
 %systemd_service_reload() %{nil}
 %systemd_trigger() %{nil}
 %systemd_post() %{nil}

+%systemd_user_post %{nil}

 %systemd_preun() %{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
 
 # Keep paths for systemd related files
 %systemdunitdir /lib/systemd/system

diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index 386eee8400df768585e0b99b950d39415dc40b51..8f3b07a4e56e1d26e61716fbb64b66524beefad0 100644 (file)
--- 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}
 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
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.tld