From 1a0aca9d26783ae9e1f34aa66ab3a74444f67031 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Thu, 22 Feb 2018 07:58:50 +0100
Subject: [PATCH] Move %end to %ldconfig_scriptlets

If people choose to use %ldconfig_post/%ldconfig_postun, let them to
deal with %end.

Reported-by: Harald Reindl <h.reindl@thelounge.net>
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1547838
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
(cherry picked from commit 987e94f6eafa02e54fb2e786572a65cda586e19c)
---
 macros.ldconfig        | 8 ++++----
 redhat-rpm-config.spec | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/macros.ldconfig b/macros.ldconfig
index 340e9fd..1aa3c2c 100644
--- a/macros.ldconfig
+++ b/macros.ldconfig
@@ -1,9 +1,9 @@
 %ldconfig /sbin/ldconfig
-%ldconfig_post %{?ldconfig:%post -p %ldconfig\
-%end}
-%ldconfig_postun %{?ldconfig:%postun -p %ldconfig\
-%end}
+%ldconfig_post %{?ldconfig:%post -p %ldconfig}
+%ldconfig_postun %{?ldconfig:%postun -p %ldconfig}
 %ldconfig_scriptlets(n:) %{?ldconfig:\
 %ldconfig_post %{?*} %{-n:-n %{-n*}}\
+%end\
 %ldconfig_postun %{?*} %{-n:-n %{-n*}}\
+%end\
 }
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 75a997f..bf5c0d6 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 74
+Version: 75
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -147,6 +147,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Thu Feb 22 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 75-1
+- Move %%end to %%ldconfig_scriptlets
+
 * Wed Feb 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 74-1
 - Fix the inevitable embarrassing typo in 73, doh