Skip to content

Commit

Permalink
rpm v5 changes the name of the file digest macro
Browse files Browse the repository at this point in the history
This sets both macros (rpm v4.9, rpm v5.4) now just in case.

This fixes test failures on OSX when setting --rpm-digest sha1
  • Loading branch information
jordansissel committed Apr 14, 2015
1 parent 03a5c60 commit c53e741
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion templates/rpm.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
# Disable checking for unpackaged files ?
#%undefine __check_files

# Use <%= attributes[:rpm_digest] %> file digest method
# Use <%= attributes[:rpm_digest] %> file digest method.
# The first macro is the one used in RPM v4.9.1.1
%define _binary_filedigest_algorithm <%= digest_algorithm %>
# This is the macro I find on OSX when Homebrew provides rpmbuild (rpm v5.4.14)
%define _build_binary_file_digest_algo <%= digest_algorithm %>

# Use <%= attributes[:rpm_compression] %> payload compression
%define _binary_payload <%= payload_compression %>
Expand Down

0 comments on commit c53e741

Please sign in to comment.