From 6ea4cb975f99cdfd447332ffa9631790a5975eea Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 25 Jun 2018 12:56:50 -0400 Subject: [PATCH 1/2] rpm: Fix typo in %_environmentdir Signed-off-by: Neal Gompa --- src/core/macros.systemd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in index f3b74f4273..a24d7bbe58 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -18,7 +18,7 @@ %_sysctldir @sysctldir@ %_sysusersdir @sysusersdir@ %_tmpfilesdir @tmpfilesdir@ -%_environmnentdir @environmentdir@ +%_environmentdir @environmentdir@ %_modulesloaddir @modulesloaddir@ %_modprobedir @modprobedir@ %_systemdgeneratordir @systemgeneratordir@ From a6bb5504583e3267d35fa385fe20f60fd998ca5d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 26 Jun 2018 07:42:29 -0400 Subject: [PATCH 2/2] rpm: Add misspelled %_environmentdir macro for temporary compatibility This should be removed after systemd 240 is released. Signed-off-by: Neal Gompa --- src/core/macros.systemd.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in index a24d7bbe58..abbb42b22f 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -26,6 +26,10 @@ %_systemd_system_env_generator_dir @systemenvgeneratordir@ %_systemd_user_env_generator_dir @userenvgeneratordir@ +# Because we had one release with a typo... +# This is temporary (Remove after systemd 240 is released) +%_environmnentdir %_environmentdir + %systemd_requires \ Requires(post): systemd \ Requires(preun): systemd \