diff --git a/0001-Add-install-target.patch b/0001-Add-install-target.patch index 5fa50cf..9f75317 100644 --- a/0001-Add-install-target.patch +++ b/0001-Add-install-target.patch @@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Björn Bidar --- - Makefile | 35 ++++++++++++++++++++++++++++++++--- - 1 file changed, 32 insertions(+), 3 deletions(-) + Makefile | 34 ++++++++++++++++++++++++++++++++-- + 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 3c5949418789b1525c8df26cfad02876730b8c53..5c07efcef76313e645ecb97e153cc28023cb9846 100644 +index 3f298c9cd5f991fa394749215e4ec3665434ad9a..9d368d669d3f1d21486ed93bf3ac77c1625adde8 100644 --- a/Makefile +++ b/Makefile -@@ -29,19 +29,32 @@ +@@ -29,20 +29,34 @@ ### Code: .POSIX: @@ -39,7 +39,8 @@ index 3c5949418789b1525c8df26cfad02876730b8c53..5c07efcef76313e645ecb97e153cc280 compat-27.elc \ compat-28.elc \ compat-29.elc \ -- compat.elc \ + compat-30.elc \ + compat.elc \ + compat.elc +DEVELOPMENT = \ compat-macs.elc \ @@ -51,7 +52,7 @@ index 3c5949418789b1525c8df26cfad02876730b8c53..5c07efcef76313e645ecb97e153cc280 all: compile -@@ -73,6 +86,22 @@ check: +@@ -74,6 +88,22 @@ check: sort | uniq > /tmp/compat-links @ (diff /tmp/compat-defs /tmp/compat-defs) diff --git a/0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch b/0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch new file mode 100644 index 0000000..daf8447 --- /dev/null +++ b/0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= +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 diff --git a/compat-29.1.4.5.tar.gz b/compat-29.1.4.5.tar.gz deleted file mode 100644 index 70dd026..0000000 --- a/compat-29.1.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aee63dc89c4b9db4cd1126abf2432e4f3c1ecb297e18159efb11ebe796d678a7 -size 132891 diff --git a/compat-30.0.0.0.tar.gz b/compat-30.0.0.0.tar.gz new file mode 100644 index 0000000..eaaf401 --- /dev/null +++ b/compat-30.0.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54ea97e2d97e955253c40de0bb537fe4d90d19d9ccee204fabf8d58ae77cec72 +size 143002 diff --git a/emacs-compat.changes b/emacs-compat.changes index e9c9e75..ac924f3 100644 --- a/emacs-compat.changes +++ b/emacs-compat.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Sat Aug 3 17:21:16 UTC 2024 - Björn Bidar + +- Add back the install_info macro's for Leap, info triggers + are not old enough for Leap +- Add patch to fix Texinfo references inside the manual: + 0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch + +------------------------------------------------------------------- +Sat Aug 03 16:23:59 UTC 2024 - Björn Bidar + +- Remove use deprecated install_info macro's +- Rebase 0001-Add-install-target.patch against new upstream version +- Update to version 30.0.0.0: + * compat-28: Mark =subr-native-elisp-p= as obsolete (renamed in Emacs 30). + * compat-30: New function =char-to-name=. + * compat-30: New function =obarray-clear=. + * compat-30: New function =interpreted-function-p=. + * compat-30: New function =primitive-function-p=. + * compat-30: New function =closurep=. + * compat-30: Add extended function =sort= with keyword arguments. + * compat-30: New function =value<=. + * compat-30: Add extended =copy-tree= with support for copying records with + non-nil optional second argument. + * compat-30: New macro =static-if=. + * compat-30: New alias =drop=. + * compat-30: New function =merge-ordered-lists=. + * compat-30: New variables =completion-lazy-hilit= and =completion-lazy-hilit-fn= + and new function =completion-lazy-hilit=. + * compat-30: New function =require-with-check=. + * compat-30: New functions =find-buffer= and =get-truename-buffer=. + * compat-30: Add extended =completion-metadata-get= with support for + =completion-category-overrides= and =completion-extra-properties=. + ------------------------------------------------------------------- Mon Mar 25 18:10:17 UTC 2024 - Björn Bidar diff --git a/emacs-compat.spec b/emacs-compat.spec index 49dd409..6a502e4 100644 --- a/emacs-compat.spec +++ b/emacs-compat.spec @@ -20,7 +20,7 @@ %global _name compat Name: emacs-%{_name} -Version: 29.1.4.5 +Version: 30.0.0.0 Release: 0 Summary: COMPATibility Library for Emacs Lisp License: GPL-3.0-or-later @@ -35,10 +35,14 @@ BuildRequires: make BuildRequires: makeinfo Requires: emacs Supplements: emacs -Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} +%if 0%{?suse_version} <= 1600 +Requires(post): %install_info_prereq +Requires(preun): %install_info_prereq +%endif # PATCH-FEATURE-UPSTREAM install targets PR 30 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 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. @@ -52,11 +56,15 @@ compat.el, the forwards-compatibility library for (GNU) Emacs Lisp, versions 24. %install %make_install +%check + +%if 0%{?suse_version} >= 1600 %post %install_info --info-dir=%{_infodir} %{_infodir}/%{_name}.info.gz %preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{_name}.info.gz +%endif %files %doc README.md