[emacs/f17] Fix org-mode to work without emacs-el installed. rhbz#830162
Karel Klíč
kklic at fedoraproject.org
Wed Jul 11 16:09:19 UTC 2012
commit 74a143e1dc719c75b43ef0de44d6f772d95399bd
Author: Karel Klic <kklic at redhat.com>
Date: Wed Jul 11 18:09:12 2012 +0200
Fix org-mode to work without emacs-el installed. rhbz#830162
emacs-locate-library.patch | 12 ++++++++++++
emacs.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
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 e6af2e8..0d9e71e 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.1
-Release: 1%{?dist}
+Release: 2%{?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
@@ -149,6 +151,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
@@ -433,6 +436,10 @@ 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
+- Fix org-mode to work without emacs-el installed.
+ rhbz#830162
+
* Mon Jun 18 2012 Karel Klíč <kklic at redhat.com> - 1:24.1-1
- New upstream release
- Switch from GTK 2 to GTK 3
More information about the scm-commits
mailing list