[emacs: 7/7] merge

[Karel Klíč]

commit 1b3fef974159b5a06c7fa636b10ccda45e25e497
Merge: c4e0752 74a143e
Author: Karel Klic <kklic at redhat.com>
Date:   Wed Jul 11 18:11:55 2012 +0200

    merge

 emacs-locate-library.patch |   12 ++++++++++++
 emacs.spec                 |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --cc emacs.spec
index 12532f2,0d9e71e..b6ef70b
--- a/emacs.spec
+++ b/emacs.spec
@@@ -3,7 -3,7 +3,7 @@@ Summary: GNU Emacs text edito
  Name: emacs
  Epoch: 1
  Version: 24.1
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: GPLv3+
  URL: http://www.gnu.org/software/emacs/
  Group: Applications/Editors
@@@ -436,9 -436,10 +439,13 @@@ update-desktop-database &> /dev/null |
  %dir %{_datadir}/emacs/site-lisp/site-start.d
  
  %changelog
 -* Wed Jul 11 2012 Karel Klíč <kklic at redhat.com> - 1:24.1-2
++* Wed Jul 11 2012 Karel Klíč <kklic at redhat.com> - 1:24.1-3
+ - Fix org-mode to work without emacs-el installed.
+   rhbz#830162
+ 
 +* Wed Jul 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 1:24.1-2
 +- Build -el, -terminal, and -filesystem as noarch (rhbz#834907).
 +
  * Mon Jun 18 2012 Karel Klíč <kklic at redhat.com> - 1:24.1-1
  - New upstream release
  - Switch from GTK 2 to GTK 3