From ffd09458665505648cc5860418e80266e3d8ffbc Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Apr 29 2020 01:09:57 +0000 Subject: Update to 2.24 Remove obsolete requirements on info --- diff --git a/.gitignore b/.gitignore index b82b889..4e5d627 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/v2.12.tar.gz -/v2.23.tar.gz +/slime-2.24.tar.gz diff --git a/223-fix-slime-version-test.patch b/223-fix-slime-version-test.patch deleted file mode 100644 index 7461f56..0000000 --- a/223-fix-slime-version-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/swank-loader.lisp b/swank-loader.lisp -index 5452dc4..93c391a 100644 ---- a/swank-loader.lisp -+++ b/swank-loader.lisp -@@ -142,17 +142,7 @@ operating system, and hardware architecture." - (defun string-starts-with (string prefix) - (string-equal string prefix :end1 (min (length string) (length prefix)))) - --(defun slime-version-string () -- "Return a string identifying the SLIME version. --Return nil if nothing appropriate is available." -- (with-open-file (s (merge-pathnames "slime.el" *source-directory*) -- :if-does-not-exist nil) -- (when s -- (loop with prefix = ";; Version: " -- for line = (read-line s nil :eof) -- until (eq line :eof) -- when (string-starts-with line prefix) -- return (subseq line (length prefix)))))) -+(defun slime-version-string () "2.23") - - (defun default-fasl-dir () - (merge-pathnames diff --git a/224-fix-slime-version-test.patch b/224-fix-slime-version-test.patch new file mode 100644 index 0000000..df628e2 --- /dev/null +++ b/224-fix-slime-version-test.patch @@ -0,0 +1,23 @@ +diff --git a/swank-loader.lisp b/swank-loader.lisp +index 5452dc4..93c391a 100644 +--- a/swank-loader.lisp ++++ b/swank-loader.lisp +@@ -142,17 +142,7 @@ operating system, and hardware architecture." + (defun string-starts-with (string prefix) + (string-equal string prefix :end1 (min (length string) (length prefix)))) + +-(defun slime-version-string () +- "Return a string identifying the SLIME version. +-Return nil if nothing appropriate is available." +- (with-open-file (s (merge-pathnames "slime.el" *source-directory*) +- :if-does-not-exist nil) +- (when s +- (loop with prefix = ";; Version: " +- for line = (read-line s nil :eof) +- until (eq line :eof) +- when (string-starts-with line prefix) +- return (subseq line (length prefix)))))) ++(defun slime-version-string () "2.24") + + (defun default-fasl-dir () + (merge-pathnames diff --git a/emacs-slime.spec b/emacs-slime.spec index bf12118..5e7eea8 100644 --- a/emacs-slime.spec +++ b/emacs-slime.spec @@ -2,8 +2,8 @@ Name: emacs-%{pkg} Epoch: 2 -Version: 2.23 -Release: 4%{?dist} +Version: 2.24 +Release: 1%{?dist} Summary: The superior lisp interaction mode for emacs #Public domain: Mentioned in README file @@ -12,17 +12,17 @@ Summary: The superior lisp interaction mode for emacs #GPLv3+: Many files in contrib are GPLv3+ License: Public Domain and GPLv3+ and GPLv2+ and LLGPL URL: http://common-lisp.net/project/slime/ -Source0: https://github.com/slime/slime/archive/v%{version}.tar.gz +Source0: https://github.com/slime/slime/archive/v%{version}.tar.gz#/%{pkg}-%{version}.tar.gz Patch1: 223-fix-test.patch -Patch2: 223-fix-slime-version-test.patch +Patch2: 224-fix-slime-version-test.patch BuildRequires: emacs texinfo common-lisp-controller # for testing BuildRequires: sbcl Requires: emacs(bin) >= %{_emacs_version} common-lisp-controller -Requires(post): info common-lisp-controller -Requires(preun): info common-lisp-controller +Requires(post): common-lisp-controller +Requires(preun): common-lisp-controller Provides: %{name}-el = %{epoch}:%{version}-%{release} Obsoletes: %{name}-el < 1:2.19-5 @@ -108,6 +108,10 @@ make check %{_infodir}/%{pkg}.info.* %changelog +* Tue Apr 28 2020 Michel Alexandre Salim - 2:2.24-1 +- Update to 2.24 +- Remove obsolete requirements on info + * Tue Jan 28 2020 Fedora Release Engineering - 2:2.23-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -115,7 +119,7 @@ make check - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Sat May 11 2019 Benjamin Kreuter - 1:2.23-1 -Updated to v2.23 +- Updated to v2.23 * Wed Apr 24 2019 Björn Esser - 1:2.19-7 - Remove hardcoded gzip suffix from GNU info pages diff --git a/sources b/sources index 3a17b63..c43f932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.23.tar.gz) = feb95f386c86d38c11cc54b6ead4c6ed74aa4d123f750431bac581ac54a110b5b68b4086747bd8191f20d1f0d587ad80c6b9a6b4174fd65b3e3511db95f89e82 +SHA512 (slime-2.24.tar.gz) = 2cc4fb3ac1007e8922655d738915aa1559eeacf383a5df6e37690f4e314ba83b0bd8c4dbafe0b1c3537f890b92f4eb451f315fa5b9db65851a05ff69d570ff54