From: Glenn Morris <rgm@gnu.org>
Date: Sat, 31 Oct 2020 02:20:24 +0000 (-0700)
Subject: Improve reproducibility of generated -pkg.el files
X-Git-Tag: emacs-27.1.90~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fc9de4b81;p=emacs.git

Improve reproducibility of generated -pkg.el files

* lisp/emacs-lisp/package.el (package-generate-description-file):
Don't include the full name of the source file in the header,
since that varies non-reproducibly according to the build directory.
https://bugs.debian.org/972861
Note that elpa.gnu.org's admin/archive-contents.el does this by hand
and already only includes the nondirectory part.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fc8dfe12ca2..504eb99eb1d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -963,7 +963,8 @@ untar into a directory named DIR; otherwise, signal an error."
       (write-region
        (concat
         ";;; Generated package description from "
-        (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file)
+        (replace-regexp-in-string "-pkg\\.el\\'" ".el"
+                                  (file-name-nondirectory pkg-file))
         "  -*- no-byte-compile: t -*-\n"
         (prin1-to-string
          (nconc