From da40fd3de38d7c17b4f7b54d3be035e7e0e430a039014a75296f7efbf7b74a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= Date: Sat, 3 Aug 2024 17:51:56 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/editors/emacs-compat?expand=0&rev=11 --- ...references-to-Emacs-30.1-in-Support-.patch | 36 +++++++++++++++++++ emacs-compat.changes | 8 +++++ emacs-compat.spec | 14 ++++++++ 3 files changed, 58 insertions(+) create mode 100644 0002-compat.texi-Fix-references-to-Emacs-30.1-in-Support-.patch 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/emacs-compat.changes b/emacs-compat.changes index c2cef57..ac924f3 100644 --- a/emacs-compat.changes +++ b/emacs-compat.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/emacs-compat.spec b/emacs-compat.spec index 68f00aa..6a502e4 100644 --- a/emacs-compat.spec +++ b/emacs-compat.spec @@ -35,8 +35,14 @@ BuildRequires: make BuildRequires: makeinfo Requires: emacs Supplements: emacs +%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,6 +58,14 @@ compat.el, the forwards-compatibility library for (GNU) Emacs Lisp, versions 24. %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 %license COPYING