Attachment 919961 Details for Bug 1122157 – specfile patch

[patch] specfile patch

0001-patch-No-longer-include-timestamp-in-header-of-.elc-.patch (text/plain), 3.37 KB, created by Benedikt Morbach on 2014-07-22 16:32:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benedikt Morbach

Created: 2014-07-22 16:32:24 UTC

Size: 3.37 KB

patch

obsolete

>From 8231742b27c01a7fe7fe556d839447898cddef6e Mon Sep 17 00:00:00 2001
>From: Benedikt Morbach <bmorbach@redhat.com>
>Date: Tue, 22 Jul 2014 17:01:38 +0200
>Subject: [PATCH] patch: No longer include timestamp in header of .elc files
>
>Ensures that the files stay the same on rebuilds.
>
>Conflicts:
>	emacs.spec
>---
> emacs-24.3-No-timestamp-in-elc-file-header.patch | 37 ++++++++++++++++++++++++
> emacs.spec                                       |  8 ++++-
> 2 files changed, 44 insertions(+), 1 deletion(-)
> create mode 100644 emacs-24.3-No-timestamp-in-elc-file-header.patch
>
>diff --git a/emacs-24.3-No-timestamp-in-elc-file-header.patch b/emacs-24.3-No-timestamp-in-elc-file-header.patch
>new file mode 100644
>index 0000000..e1be0a2
>--- /dev/null
>+++ b/emacs-24.3-No-timestamp-in-elc-file-header.patch
>@@ -0,0 +1,37 @@
>+From 1b6228bee2e3d8992a101c98cc47583df23b9776 Mon Sep 17 00:00:00 2001
>+From: Glenn Morris <rgm@gnu.org>
>+Date: Sat, 20 Apr 2013 12:48:04 -0700
>+Subject: [PATCH] No longer include timestamp in header of .elc files
>+
>+This removes needless differences between files compiled at different
>+times or by different people, or from sources in different locations.
>+Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00187.html
>+
>+* lisp/emacs-lisp/bytecomp.el (byte-compile-insert-header):
>+No longer include timestamp etc information.
>+
>+* etc/NEWS: Mention this.
>+---
>+ lisp/emacs-lisp/bytecomp.el | 6 +-----
>+ 3 files changed, 8 insertions(+), 5 deletions(-)
>+
>+diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
>+index 5db1793..755d5f7 100644
>+--- a/lisp/emacs-lisp/bytecomp.el
>++++ b/lisp/emacs-lisp/bytecomp.el
>+@@ -1997,11 +1997,7 @@ Call from the source buffer."
>+       ;; >4	byte		x		version %d
>+       (insert
>+        ";ELC" 23 "\000\000\000\n"
>+-       ";;; Compiled by "
>+-       (or (and (boundp 'user-mail-address) user-mail-address)
>+-	   (concat (user-login-name) "@" (system-name)))
>+-       " on " (current-time-string) "\n"
>+-       ";;; from file " filename "\n"
>++       ";;; Compiled\n"
>+        ";;; in Emacs version " emacs-version "\n"
>+        ";;; with"
>+        (cond
>+-- 
>+1.9.3
>+
>diff --git a/emacs.spec b/emacs.spec
>index bd6fa43..0eb63fe 100644
>--- a/emacs.spec
>+++ b/emacs.spec
>@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
> Name: emacs
> Epoch: 1
> Version: 24.3
>-Release: 18%{?dist}
>+Release: 19%{?dist}
> License: GPLv3+
> URL: http://www.gnu.org/software/emacs/
> Group: Applications/Editors
>@@ -18,6 +18,8 @@ Source6: emacs-terminal.desktop
> Source7: emacs-terminal.sh
> # rhbz#713600
> Patch7: emacs-spellchecker.patch
>+# make builds containing .elc files reproducible
>+Patch8: emacs-24.3-No-timestamp-in-elc-file-header.patch
> 
> # Fix for emacs bug #922519
> Patch10: emacs-style-change-cb.patch
>@@ -175,6 +177,7 @@ packages that add functionality to Emacs.
> %setup -q
> 
> %patch7 -p1 -b .spellchecker
>+%patch8 -p1 -b .timestamp
> 
> %patch10 -p1 -b .style-change-cb.patch
> %patch11 -p1 -b .bell-dont-work.patch
>@@ -470,6 +473,9 @@ update-desktop-database &> /dev/null || :
> %dir %{_datadir}/emacs/site-lisp/site-start.d
> 
> %changelog
>+* Tue Jul 22 2014 Benedikt Morbach <bmorbach@redhat.com> - 1:24.3-18
>+- Add patch to remove timestamp from .elc files. This ensures that those stay the same on rebuilds.
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:24.3-18
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1122157: 919960 | 919961