From 098bb02d24b296efdea16272eca5ad78855cc6f6 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Aug 18 2018 20:16:40 +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 1d2435e..966fbbe 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -11,7 +11,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        30
-Release:        0.2
+Release:        0.3
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -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,6 +347,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 /usr/sbin/convert-to-edition
 
 %changelog
+* Fri Aug 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 30-0.3
+- 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> - 30-0.2
 - Enable dbus user units explicitly