[emacs/f15: 11/11] merge with f16 branch

[Karel Klíč]

commit 2c39f2628b41c004263e0a53bc7009c9826947e4
Merge: dc557ea 0f6ddf4
Author: Karel Klic <kklic at redhat.com>
Date:   Tue Nov 22 19:10:15 2011 +0100

    merge with f16 branch

 .gitignore                 |    1 +
 default.el                 |    2 +
 dotemacs.el                |   19 ++++--------
 emacs-23.2-m17ncheck.patch |   14 ---------
 emacs-23.2-spacing.patch   |   26 -----------------
 emacs.spec                 |   67 +++++++++++++++++++++++++++-----------------
 rpm-spec-mode-init.el      |    1 +
 site-start.el              |   10 ++++--
 sources                    |    2 +-
 9 files changed, 60 insertions(+), 82 deletions(-)
---
diff --cc emacs.spec
index f5585d0,6ebb11d..861f1bc
--- a/emacs.spec
+++ b/emacs.spec
@@@ -442,13 -426,38 +426,44 @@@ update-desktop-database &> /dev/null |
  %dir %{_datadir}/emacs/site-lisp/site-start.d
  
  %changelog
+ * Thu Jun 30 2011 Ville Skyttä <ville.skytta at iki.fi> - 1:23.3-7
+ - Use custom-set-variables for customizable variables in .emacs (#716440).
+ - Move frame-title-format default from .emacs to default.el (#716443).
+ 
+ * Thu May 26 2011 Karel Klíč <kklic at redhat.com> - 1:23.3-6
+ - Enumerate binaries in emacs-common to avoid packaging single binary
+   multiple times by accident
+ 
+ * Mon May 23 2011 Karel Klíč <kklic at redhat.com> - 1:23.3-5
+ - Removed %%defattr from %%files sections, as RPM no longer needs it
+ - Removed %%dir %%{_libexecdir}/emacs and similar from emacs and
+   emacs-nox packages, as the directories are used and present only in
+   emacs-common (rhbz#704067)
+ 
+ * Tue Mar 22 2011 Karel Klic <kklic at redhat.com> - 1:23.3-4
+ - Rebuild to fix an RPM issue (rhbz689182)
+ 
+ * Tue Mar 15 2011 Ville Skyttä <ville.skytta at 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 at 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,
+   but there seems to be no elegant way how to prevent this while
+   having versioned binaries (/bin/emacs-%%{version}) at the same time.
+ - Removed 'rm -rf %%{buildroot}' from %%install section
+ 
+ * Thu Mar 10 2011 Karel Klic <kklic at redhat.com> - 1:23.3-1
+ - New upstream release
+ - Depend on util-linux directly, as the package no longer provides setarch
+ 
 +* Mon May 23 2011 Karel Klíč <kklic at redhat.com> - 1:23.2-19
 +- Fix the handling of alternatives (rhbz#684447)
 +  The current process loses alternatives preference on every upgrade,
 +  but there seems to be no elegant way how to prevent this while
 +  having versioned binaries (/bin/emacs-%%{version}) at the same time.
- - Depend on util-linux directly, as the package no longer provides setarch
 +
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:23.2-18
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild