From b40c4b9a4fc0fba414ee249203883ba7842bab9e Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Aug 19 2018 19:29:03 +0000
Subject: Escape %distprefix in the spec


The point is %distprefix is to allow things like the forge macros to add
things to %dist without overriding its value. But currently %distprefix
gets expanded (to nothing) in the fedora-release specfile, which
prevents it from appearing as desired in the installed macros.dist file.

Signed-off-by: Jason Tibbitts <tibbs@math.uh.edu>
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

---

diff --git a/fedora-release.spec b/fedora-release.spec
index 02c9220..50ada5e 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -202,7 +202,7 @@ cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
 # dist macros.
 
 %%fedora                %{dist_version}
-%%dist                %{?distprefix}.fc%{dist_version}
+%%dist                %%{?distprefix}.fc%{dist_version}
 %%fc%{dist_version}                1
 EOF
 
@@ -347,7 +347,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 /usr/sbin/convert-to-edition
 
 %changelog
-* Wed Aug 15 2018 David Herrmann <dh.herrmann@gmail.com> - 30-0.2
+* Sat Aug 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 29-0.12
+- Escape use of the distprefix macro, so it makes it into the macro
+  file instead of being expanded in the spec.
+
+* Wed Aug 15 2018 David Herrmann <dh.herrmann@gmail.com> - 29-0.12
 - Enable dbus user units explicitly
 
 * Tue Aug 14 2018 Mohan Boddu <mboddu@bhujji.com> 29-0.11