#11 Escape %distprefix in the spec
Merged 5 years ago by kevin. Opened 5 years ago by zbyszek.
rpms/ zbyszek/fedora-release distprefix-macro-f29  into  f29

file modified
+6 -2
@@ -202,7 +202,7 @@ 

  # dist macros.

  

  %%fedora                %{dist_version}

- %%dist                %{?distprefix}.fc%{dist_version}

+ %%dist                %%{?distprefix}.fc%{dist_version}

  %%fc%{dist_version}                1

  EOF

  
@@ -347,7 +347,11 @@ 

  /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

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

ok, can you please rebase this now?

rebased onto 62cf77c98d6cb48fdc68965e8c86135723c07107

5 years ago

rebased onto b40c4b9

5 years ago

Rebased.

I noticed that I made an error in the just-merged commit in the version in the changelog. This patch fixes that.

Pull-Request has been merged by kevin

5 years ago