From 1b3fef974159b5a06c7fa636b10ccda45e25e497 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Jul 11 2012 16:11:55 +0000
Subject: merge


---

diff --git a/emacs-locate-library.patch b/emacs-locate-library.patch
new file mode 100644
index 0000000..0d352bc
--- /dev/null
+++ b/emacs-locate-library.patch
@@ -0,0 +1,12 @@
+diff -up emacs-24.1/lisp/org/org-exp-blocks.el.locate-library emacs-24.1/lisp/org/org-exp-blocks.el
+--- emacs-24.1/lisp/org/org-exp-blocks.el.locate-library	2012-07-11 17:11:42.053056590 +0200
++++ emacs-24.1/lisp/org/org-exp-blocks.el	2012-07-11 17:11:47.716973793 +0200
+@@ -240,7 +240,7 @@ which defaults to the value of `org-expo
+ 			      (file-name-as-directory
+ 			       (expand-file-name
+ 				"../contrib"
+-				(file-name-directory (find-library-name "org")))))))
++				(file-name-directory (locate-library "org")))))))
+   "Path to the ditaa jar executable."
+   :group 'org-babel
+   :type 'string)
diff --git a/emacs.spec b/emacs.spec
index 12532f2..b6ef70b 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 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
@@ -28,6 +28,8 @@ Patch2: rpm-spec-mode-utc.patch
 Patch3: rpm-spec-mode-changelog.patch
 # rhbz#713600
 Patch7: emacs-spellchecker.patch
+# rhbz#830162
+Patch8: emacs-locate-library.patch
 
 BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk3-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -152,6 +154,7 @@ packages that add functionality to Emacs.
 
 %patch0 -p1 -b .glibc-open-macro
 %patch7 -p1 -b .spellchecker
+%patch8 -p1 -b .locate-library
 
 # Install site-lisp files
 cp %SOURCE7 %SOURCE10 site-lisp
@@ -436,6 +439,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Wed Jul 11 2012 Karel Klíč <kklic@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@iki.fi> - 1:24.1-2
 - Build -el, -terminal, and -filesystem as noarch (rhbz#834907).