[emacs-slime/f17] Removed known_implementations.patch. Allows user to select the lisp program.Hardcode slime-backend v
narasim
narasim at fedoraproject.org
Wed Jul 25 08:27:45 UTC 2012
commit 6581fc88ed0e9da3feeb27fdeaa3265a70be0f7a
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date: Wed Jul 25 13:56:54 2012 +0530
Removed known_implementations.patch. Allows user to select the lisp program.Hardcode slime-backend variable.
deleted: changelog.patch
modified: emacs-slime.spec
deleted: known_implementations.patch
new file: slime_fix_changelog_and_backend.patch
renamed: fix_paths.patch -> swank_changelog_plus_location.patch
changelog.patch | 14 -------
emacs-slime.spec | 17 +++++---
known_implementations.patch | 29 --------------
slime_fix_changelog_and_backend.patch | 40 ++++++++++++++++++++
...hs.patch => swank_changelog_plus_location.patch | 19 +--------
5 files changed, 52 insertions(+), 67 deletions(-)
---
diff --git a/emacs-slime.spec b/emacs-slime.spec
index 6ad4e02..32e2fb4 100644
--- a/emacs-slime.spec
+++ b/emacs-slime.spec
@@ -4,7 +4,7 @@
Name: emacs-%{pkg}
Version: 3.0
-Release: 0.5.%{alphatag}%{?dist}
+Release: 0.6.%{alphatag}%{?dist}
Summary: The superior lisp interaction mode for emacs
Group: Applications/Editors
@@ -24,9 +24,8 @@ Requires(post): info common-lisp-controller
Requires(preun): info common-lisp-controller
BuildArch: noarch
-Patch1: changelog.patch
-Patch2: fix_paths.patch
-Patch3: known_implementations.patch
+Patch1: slime_fix_changelog_and_backend.patch
+Patch2: swank_changelog_plus_location.patch
%description
SLIME is a Emacs mode for common Lisp development.
@@ -44,7 +43,6 @@ to install this package to use %{name}.
%setup -q -n %{pkg}-2012-05-25
%patch1 -p1
%patch2 -p1
-%patch3 -p1
iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.conv && mv ChangeLog.conv ChangeLog
@@ -57,7 +55,7 @@ make slime.info
rm -rf %{buildroot}
install -pm 755 -d %{buildroot}%{_emacs_sitestartdir}
-install -pm 644 *.elc %{buildroot}%{_emacs_sitestartdir}
+install -pm 644 *.el %{buildroot}%{_emacs_sitestartdir}
install -pm 755 -d %{buildroot}%{_infodir}
install -pm 644 doc/%{pkg}.info %{buildroot}%{_infodir}/
@@ -97,7 +95,7 @@ fi
%doc ChangeLog NEWS PROBLEMS README doc/slime-small.pdf doc/slime-refcard.pdf contrib/contrib-README contrib/contrib-ChangeLog
%dir %{_emacs_sitestartdir}
-%{_emacs_sitestartdir}/*.elc
+%{_emacs_sitestartdir}/*.el
%dir %{_emacs_sitelispdir}/%{pkg}
%dir %{_emacs_sitelispdir}/%{pkg}/contrib
@@ -119,6 +117,11 @@ fi
%{_emacs_sitelispdir}/%{pkg}/*.el
%changelog
+* Wed Jul 25 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 3.0-0.6.20120525cvs
+- Hardcode location of slime-backend
+- Renamed patches
+- Removed known_implementations.patch. Otherwise inferior-lisp-program variable is not used by slime.
+
* Mon Jul 23 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 3.0-0.5.20120525cvs
- All .el files go into -el package except for those under contrib. They go into common-lisp/source/slime
- Copy readme and changelog into contrib folder. Gives an idea of how to load the definitions into emacs.
diff --git a/slime_fix_changelog_and_backend.patch b/slime_fix_changelog_and_backend.patch
new file mode 100644
index 0000000..e2aa201
--- /dev/null
+++ b/slime_fix_changelog_and_backend.patch
@@ -0,0 +1,40 @@
+--- slime-2012-05-25_orig/slime.el 2012-06-04 23:25:57.000000000 +0530
++++ slime-2012-05-25/slime.el 2012-07-25 13:18:46.164677071 +0530
+@@ -97,7 +97,8 @@
+ (when (member 'lisp-mode slime-lisp-modes)
+ (add-hook 'lisp-mode-hook 'slime-lisp-mode-hook))
+ (setq slime-setup-contribs contribs)
+- (slime-setup-contribs))
++ (slime-setup-contribs)
++ (add-to-list 'load-path "/usr/share/common-lisp/source/slime/"))
+
+ (defun slime-setup-contribs ()
+ "Load and initialize contribs."
+@@ -119,7 +120,7 @@
+ "Return the datestring of the latest entry in the ChangeLog file.
+ Return nil if the ChangeLog file cannot be found."
+ (interactive "p")
+- (let ((changelog (concat slime-path "ChangeLog"))
++ (let ((changelog "/usr/share/doc/emacs-slime-3.0/Changelog")
+ (date nil))
+ (when (file-exists-p changelog)
+ (with-temp-buffer
+@@ -131,8 +132,7 @@
+ date)))
+
+ (defvar slime-protocol-version nil)
+-(setq slime-protocol-version
+- (eval-when-compile (slime-changelog-date)))
++(setq slime-protocol-version (slime-changelog-date))
+
+
+ ;;;; Customize groups
+@@ -171,7 +171,7 @@
+ :prefix "slime-"
+ :group 'slime)
+
+-(defcustom slime-backend "swank-loader.lisp"
++(defcustom slime-backend "/usr/share/common-lisp/source/slime/swank-loader.lisp"
+ "The name of the Lisp file that loads the Swank server.
+ This name is interpreted relative to the directory containing
+ slime.el, but could also be set to an absolute filename."
diff --git a/fix_paths.patch b/swank_changelog_plus_location.patch
similarity index 62%
rename from fix_paths.patch
rename to swank_changelog_plus_location.patch
index ea0e0fd..ae8c2b5 100644
--- a/fix_paths.patch
+++ b/swank_changelog_plus_location.patch
@@ -1,20 +1,5 @@
-Index: slime/slime.el
-===================================================================
---- slime.orig/slime.el 2012-04-21 21:47:22.000000001 +0200
-+++ slime/slime.el 2012-04-21 21:47:36.000000001 +0200
-@@ -119,7 +119,7 @@
- "Return the datestring of the latest entry in the ChangeLog file.
- Return nil if the ChangeLog file cannot be found."
- (interactive "p")
-- (let ((changelog (concat slime-path "ChangeLog"))
-+ (let ((changelog "/usr/share/doc/emacs-slime-3.0/Changelog")
- (date nil))
- (when (file-exists-p changelog)
- (with-temp-buffer
-Index: slime/swank-loader.lisp
-===================================================================
---- slime.orig/swank-loader.lisp 2012-04-21 21:47:09.000000001 +0200
-+++ slime/swank-loader.lisp 2012-04-21 21:47:36.000000001 +0200
+--- slime-2012-05-25_orig/swank-loader.lisp 2012-06-04 23:25:57.000000000 +0530
++++ slime-2012-05-25/swank-loader.lisp 2012-07-25 13:09:34.490100106 +0530
@@ -17,6 +17,10 @@
;; (setq swank-loader::*fasl-directory* "/tmp/fasl/")
;; (swank-loader:init)
More information about the scm-commits
mailing list