From d72ab73818fd94ccb0e727ac3b7a9a76865e7cdc Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <tim@tim-landscheidt.de>
Date: Jan 05 2019 08:45:08 +0000
Subject: Fix setting compiling user for XEmacs byte-compiled files


---

diff --git a/bigloo.spec b/bigloo.spec
index 74e4e8b..b872dc8 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -19,7 +19,7 @@
 
 Name:           bigloo
 Version:        4.3c
-Release:        1%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
+Release:        2%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist}
 Summary:        A compiler for the Scheme programming language
 
 License:        GPLv2+
@@ -137,13 +137,6 @@ sed -i 's/LDOPTS=\"/&-Wl,--as-needed -lgc /' Makefile.misc
 # Defeat attempts at inserting unnecessary rpaths
 sed -ri 's/ ?-Wl,-rpath=[^"]+(")/\1/' configure
 
-# Get reproducible builds by setting the compiling username for XEmacs
-mkdir ~/.xemacs
-echo >> ~/.xemacs/custom.el << EOF
-(custom-set-variables
- '(user-mail-address "mockbuild@fedoraproject.org"))
-EOF
-
 
 %build
 %define inplace $PWD/inplace
@@ -252,13 +245,17 @@ make clean
 rm -f bmacs-gnu-emacs.el bug/bug-gnu-emacs.el
 sed -i -e '/bmacs-gnu-emacs\.el/D' -e 's/ bug-gnu-emacs//' Makefile
 sed -i 's,emacs/site-lisp,xemacs/site-packages/lisp,' bmacs-config.el
-make EMACS=xemacs EMACSBRAND=xemacs EMACSDIR=%{buildroot}%{_xemacs_sitelispdir}/bigloo
+# Get reproducible builds by setting the compiling username for
+# XEmacs.
+make EMACS=xemacs EMACSBRAND=xemacs EMACSDIR=%{buildroot}%{_xemacs_sitelispdir}/bigloo XEMACSFLAGS="-no-site-file -eval '(setq user-mail-address \\\"mockbuild@fedoraproject.org\\\")'"
 make EMACS=xemacs EMACSBRAND=xemacs EMACSDIR=%{buildroot}%{_xemacs_sitelispdir}/bigloo install
 cd %{buildroot}%{_xemacs_sitelispdir}/bigloo
 mkdir -p ../../etc/bigloo
 mv etc/* ../../etc/bigloo
 rmdir etc
-%{_xemacs_bytecompile} bmacs.el bmacs-config.el bmacs-xemacs.el xemacs-etags.el
+# It's a bit more complicated to set the compiling username for
+# %%_xemacs_bytecompile.
+%{lua: print((string.gsub(rpm.expand("%{_xemacs_bytecompile}"), "^(.*-eval ')(.*)('.*)$", "%1(progn (setq user-mail-address \"mockbuild@fedoraproject.org\") %2)%3")));} bmacs.el bmacs-config.el bmacs-xemacs.el xemacs-etags.el
 sed -i 's|%{buildroot}||' bmacs.elc bmacs-config.elc
 popd
 
@@ -301,6 +298,9 @@ make test
 
 
 %changelog
+* Fri Jan  4 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 4.3c-2
+- Fix setting compiling user for XEmacs byte-compiled files
+
 * Sat Sep 15 2018 Jerry James <loganjerry@gmail.com> - 4.3c-1
 - Update to 4.3c