New upstream version 240

[systemd.git] / src / core / macros.systemd.in

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index f3b74f42739ca65da0bf0fce2a206b9d64f21355..9ccad5ebfe8f8ff9a93f6b9658b49b013ee8d6f7 100644 (file)
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -2,8 +2,6 @@
 #  SPDX-License-Identifier: LGPL-2.1+
 #
 #  This file is part of systemd.
-#
-#  Copyright 2012 Lennart Poettering
 
 # RPM macros for packages installing systemd unit files
 
@@ -18,7 +16,7 @@
 %_sysctldir @sysctldir@
 %_sysusersdir @sysusersdir@
 %_tmpfilesdir @tmpfilesdir@
-%_environmnentdir @environmentdir@
+%_environmentdir @environmentdir@
 %_modulesloaddir @modulesloaddir@
 %_modprobedir @modprobedir@
 %_systemdgeneratordir @systemgeneratordir@
@@ -26,6 +24,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 %{warn:Use %%_environmentdir instead}%_environmentdir
+
 %systemd_requires \
 Requires(post): systemd \
 Requires(preun): systemd \