forked from pool/emacs-compat
Compare commits
5 Commits
Author | SHA256 | Date | |
---|---|---|---|
4d8ce583f7 | |||
|
b05d31de3b | ||
|
21b7ce4b15 | ||
eceba3ecf3 | |||
f71ad8a813 |
@@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit
|
|||||||
|
|
||||||
Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
|
Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
|
||||||
---
|
---
|
||||||
Makefile | 34 ++++++++++++++++++++++++++++++++--
|
Makefile | 33 +++++++++++++++++++++++++++++++--
|
||||||
1 file changed, 32 insertions(+), 2 deletions(-)
|
1 file changed, 31 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index 3f298c9cd5f991fa394749215e4ec3665434ad9a..9d368d669d3f1d21486ed93bf3ac77c1625adde8 100644
|
index d584bc3f78f00d559200c144e8a62bb84c4fd385..5a065652a1be0b1be38607ee11dcef23ed03415b 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -29,20 +29,34 @@
|
@@ -29,7 +29,7 @@
|
||||||
### Code:
|
### Code:
|
||||||
|
|
||||||
.POSIX:
|
.POSIX:
|
||||||
@@ -23,12 +23,17 @@ index 3f298c9cd5f991fa394749215e4ec3665434ad9a..9d368d669d3f1d21486ed93bf3ac77c1
|
|||||||
+.PHONY: all compile force-compile test clean check install
|
+.PHONY: all compile force-compile test clean check install
|
||||||
.SUFFIXES: .el .elc
|
.SUFFIXES: .el .elc
|
||||||
|
|
||||||
|
ifeq ($(CI),true)
|
||||||
|
@@ -37,18 +37,31 @@ ifeq ($(CI),true)
|
||||||
|
else
|
||||||
|
STRICT =
|
||||||
|
endif
|
||||||
+DESTDIR ?=
|
+DESTDIR ?=
|
||||||
+PREFIX ?= /usr
|
+PREFIX ?= /usr
|
||||||
+DATADIR ?= $(PREFIX)/share
|
+DATADIR ?= $(PREFIX)/share
|
||||||
+ELDIR ?= $(DATADIR)/emacs/site-lisp
|
+ELDIR ?= $(DATADIR)/emacs/site-lisp
|
||||||
+INFODIR ?= $(DATADIR)/info
|
+INFODIR ?= $(DATADIR)/info
|
||||||
+
|
|
||||||
EMACS = emacs
|
EMACS = emacs
|
||||||
MAKEINFO = makeinfo
|
MAKEINFO = makeinfo
|
||||||
-BYTEC = compat-25.elc \
|
-BYTEC = compat-25.elc \
|
||||||
@@ -52,13 +57,13 @@ index 3f298c9cd5f991fa394749215e4ec3665434ad9a..9d368d669d3f1d21486ed93bf3ac77c1
|
|||||||
|
|
||||||
all: compile
|
all: compile
|
||||||
|
|
||||||
@@ -74,6 +88,22 @@ check:
|
@@ -80,6 +93,22 @@ check:
|
||||||
sort | uniq > /tmp/compat-links
|
sort | uniq > /tmp/compat-links
|
||||||
@ (diff /tmp/compat-defs /tmp/compat-defs)
|
@diff /tmp/compat-defs /tmp/compat-links
|
||||||
|
|
||||||
+install: $(addprefix install-,compat-runtime-el compat-info)
|
+install: $(addprefix install-,compat-runtime-el compat-info)
|
||||||
+
|
+
|
||||||
+install-compat-runtime-el: $(RUNTIME) $(RUNTIME:.elc=.el)
|
+install-compat-runtime-el: $(RUNTIME) $(RUNTIME:.elc=.el) compat-macs.el
|
||||||
+
|
+
|
||||||
+install-compat-info: compat.info
|
+install-compat-info: compat.info
|
||||||
+
|
+
|
||||||
|
@@ -1,36 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <bjorn.bidar@thaodan.de>
|
|
||||||
Date: Sat, 3 Aug 2024 20:03:38 +0300
|
|
||||||
Subject: [PATCH] compat.texi: Fix references to Emacs 30.1 in Support section
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
makeinfo compat.texi
|
|
||||||
compat.texi:2251: warning: node `Emacs 30.1' is next for `Emacs 29.1' in sectioning but not in menu
|
|
||||||
compat.texi:3316: warning: node `Emacs 29.1' is prev for `Emacs 30.1' in sectioning but not in menu
|
|
||||||
compat.texi:3316: warning: node `Support' is up for `Emacs 30.1' in sectioning but not in menu
|
|
||||||
compat.texi:300: node `Support' lacks menu item for `Emacs 30.1' despite being its Up target
|
|
||||||
make: *** [Makefile:116: compat.info] Error 1
|
|
||||||
---
|
|
||||||
compat.texi | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/compat.texi b/compat.texi
|
|
||||||
index 41725d03bd2f8fd6065d0293b34ec0d390a54353..b7bb45c809b785927d4367a024fc746e4eda5242 100644
|
|
||||||
--- a/compat.texi
|
|
||||||
+++ b/compat.texi
|
|
||||||
@@ -74,6 +74,7 @@ Support
|
|
||||||
* Emacs 27.1:: Compatibility support for Emacs 27.1
|
|
||||||
* Emacs 28.1:: Compatibility support for Emacs 28.1
|
|
||||||
* Emacs 29.1:: Compatibility support for Emacs 29.1
|
|
||||||
+* Emacs 30.1:: Compatibility support for Emacs 30.1
|
|
||||||
|
|
||||||
@end detailmenu
|
|
||||||
@end menu
|
|
||||||
@@ -309,6 +310,7 @@ manage to provide for each Emacs version.
|
|
||||||
* Emacs 27.1:: Compatibility support for Emacs 27.1
|
|
||||||
* Emacs 28.1:: Compatibility support for Emacs 28.1
|
|
||||||
* Emacs 29.1:: Compatibility support for Emacs 29.1
|
|
||||||
+* Emacs 30.1:: Compatibility support for Emacs 30.1
|
|
||||||
@end menu
|
|
||||||
|
|
||||||
@node Emacs 25.1
|
|
8
_service
8
_service
@@ -1,6 +1,6 @@
|
|||||||
<!-- -*- xml -*- !-->
|
<!-- -*- xml -*- !-->
|
||||||
<services>
|
<services>
|
||||||
<service name="obs_scm" mode="disabled">
|
<service name="obs_scm" mode="manual">
|
||||||
<param name="versionformat">@PARENT_TAG@</param>
|
<param name="versionformat">@PARENT_TAG@</param>
|
||||||
<param name="url">https://github.com/emacs-compat/compat.git</param>
|
<param name="url">https://github.com/emacs-compat/compat.git</param>
|
||||||
<param name="filename">compat</param>
|
<param name="filename">compat</param>
|
||||||
@@ -9,10 +9,10 @@
|
|||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
<param name="changesauthor">Björn Bidar <bjorn.bidar@thaodan.de></param>
|
<param name="changesauthor">Björn Bidar <bjorn.bidar@thaodan.de></param>
|
||||||
</service>
|
</service>
|
||||||
<service mode="disabled" name="tar" />
|
<service mode="manual" name="tar" />
|
||||||
<service mode="disabled" name="recompress">
|
<service mode="manual" name="recompress">
|
||||||
<param name="file">*.tar</param>
|
<param name="file">*.tar</param>
|
||||||
<param name="compression">gz</param>
|
<param name="compression">gz</param>
|
||||||
</service>
|
</service>
|
||||||
<service name="set_version" mode="disabled"/>
|
<service name="set_version" mode="manual"/>
|
||||||
</services>
|
</services>
|
||||||
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:54ea97e2d97e955253c40de0bb537fe4d90d19d9ccee204fabf8d58ae77cec72
|
|
||||||
size 143002
|
|
3
compat-30.1.0.1.tar.gz
Normal file
3
compat-30.1.0.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e371c7dbfd7d583b2654b3351f351a8f42f7c8c146f6f377e3baf10cda30c114
|
||||||
|
size 147293
|
@@ -1,3 +1,34 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 04 19:13:12 UTC 2025 - Björn Kettunen <bjorn.kettunen@thaodan.de>
|
||||||
|
|
||||||
|
- Remove patch to fix TexInfo references in manual as hit has been merged
|
||||||
|
upstream
|
||||||
|
* 0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch
|
||||||
|
- Update 0001-Add-install-target.patch to also install compat-macs.el
|
||||||
|
|
||||||
|
- Update to version 30.1.0.1:
|
||||||
|
* compat-28: Fix 'named-let's TCO involving short-circuiting 'and'
|
||||||
|
|
||||||
|
- Update to version 30.1.0.0
|
||||||
|
* compat-tests--color-approx-equal: Fix naming convention
|
||||||
|
* compat-30: Add oklab color functions
|
||||||
|
* compat-tests: Reenable disabled tests
|
||||||
|
|
||||||
|
- Update to version 30.0.2.0
|
||||||
|
* compat-30: Rename trusted-content variable
|
||||||
|
|
||||||
|
- Update to version 30.0.1.0
|
||||||
|
* compat-30: untrusted-content, trusted-files, trusted-content-p
|
||||||
|
* compat-tests: Temporarily disable require-with-check test on 30
|
||||||
|
* compat-30: Update require-with-check
|
||||||
|
* compat.texi: Fix replace-string-in-region documentation (Fix gh#emacs-compat/compat#52)
|
||||||
|
* compat.texi: Fix references to Emacs 30.1 in Support section (gh#emacs-compat/compat#49)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 9 12:13:53 UTC 2025 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- Install also compat-mac.el as native compilation search for it
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Aug 3 17:21:16 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>
|
Sat Aug 3 17:21:16 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>
|
||||||
|
|
||||||
@@ -56,7 +87,7 @@ Wed Jan 31 08:10:11 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>
|
|||||||
|
|
||||||
- Update to version 29.1.4.4:
|
- Update to version 29.1.4.4:
|
||||||
* The maintainer field accepts only a single mail address
|
* The maintainer field accepts only a single mail address
|
||||||
* fix(compat.el): Package-Requires "seq" = 2.3 -> 2.23 (#31)
|
* fix(compat.el): Package-Requires "seq" = 2.3 -> 2.23 (gh#emacs-compat/compat#31)
|
||||||
* compat.texi: Fix typos
|
* compat.texi: Fix typos
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
@@ -1,8 +1,10 @@
|
|||||||
#
|
#
|
||||||
# spec file for package emacs-compat
|
# spec file for package emacs-compat
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
# Copyright (c) 2024 Björn Bidar
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
|
# Copyright (c) 2025 Björn Kettunen
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -18,9 +20,10 @@
|
|||||||
|
|
||||||
|
|
||||||
%global _name compat
|
%global _name compat
|
||||||
|
%bcond_with check
|
||||||
|
|
||||||
Name: emacs-%{_name}
|
Name: emacs-%{_name}
|
||||||
Version: 30.0.0.0
|
Version: 30.1.0.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: COMPATibility Library for Emacs Lisp
|
Summary: COMPATibility Library for Emacs Lisp
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@@ -41,8 +44,6 @@ Requires(preun): %install_info_prereq
|
|||||||
%endif
|
%endif
|
||||||
# PATCH-FEATURE-UPSTREAM install targets PR 30
|
# PATCH-FEATURE-UPSTREAM install targets PR 30
|
||||||
Patch1: 0001-Add-install-target.patch
|
Patch1: 0001-Add-install-target.patch
|
||||||
# # PATCH-FEATURE-UPSTREAM Fix Texinfo references PR 49
|
|
||||||
Patch2: 0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
compat.el, the forwards-compatibility library for (GNU) Emacs Lisp, versions 24.4 and newer. The intended audience are package developers that are interested in using newer developments, without having to break compatibility.
|
compat.el, the forwards-compatibility library for (GNU) Emacs Lisp, versions 24.4 and newer. The intended audience are package developers that are interested in using newer developments, without having to break compatibility.
|
||||||
@@ -56,7 +57,11 @@ compat.el, the forwards-compatibility library for (GNU) Emacs Lisp, versions 24.
|
|||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
|
%if %{with check}
|
||||||
%check
|
%check
|
||||||
|
%make_build check
|
||||||
|
%make_build test
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1600
|
%if 0%{?suse_version} >= 1600
|
||||||
%post
|
%post
|
||||||
|
Reference in New Issue
Block a user