From b50677584ed3bd47d57fcac63c076c2069b70b1a Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Tue, 15 Mar 2011 20:56:39 +0100
Subject: [PATCH] Use UTC timestamps in rpm-spec-mode changelog entries by
 default; Consider *.elc in addition to *.el when loading files from
 site-start.d

---
 emacs.spec            |  6 +++++-
 rpm-spec-mode-init.el |  1 +
 site-start.el         | 10 +++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/emacs.spec b/emacs.spec
index f178400..f99374e 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -434,6 +434,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Tue Mar 15 2011 Ville Skyttä <ville.skytta@iki.fi> - 1:23.3-3
+- Use UTC timestamps in rpm-spec-mode changelog entries by default (rhbz#672350)
+- Consider *.elc in addition to *.el when loading files from site-start.d (rhbz#672324)
+
 * Tue Mar 15 2011 Karel Klic <kklic@redhat.com> - 1:23.3-2
 - Another attempt to fix the handling of alternatives (rhbz#684447)
   The current process loses alternatives preference on every upgrade,
diff --git a/rpm-spec-mode-init.el b/rpm-spec-mode-init.el
index 48ed0bf..057d3c8 100644
--- a/rpm-spec-mode-init.el
+++ b/rpm-spec-mode-init.el
@@ -2,3 +2,4 @@
 
 (autoload 'rpm-spec-mode "rpm-spec-mode" "RPM spec mode." t)
 (add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . rpm-spec-mode))
+(setq-default rpm-change-log-uses-utc t)
diff --git a/site-start.el b/site-start.el
index 102a442..efbb75b 100644
--- a/site-start.el
+++ b/site-start.el
@@ -1,5 +1,9 @@
 ;;; loaded before user's ".emacs" file and default.el
 
-;; load ".el" files in "/usr/share/emacs/site-lisp/site-start.d/" on startup
-(mapc 'load
-      (directory-files "/usr/share/emacs/site-lisp/site-start.d" t "\\.el\\'"))
+;; load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup
+(mapc
+ 'load
+ (delete-dups
+  (mapcar 'file-name-sans-extension
+          (directory-files
+           "/usr/share/emacs/site-lisp/site-start.d" t "\\.elc?\\'"))))