diff --git a/.gitignore b/.gitignore index f729f2d..87ae9f2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,3 @@ abcplus_en-1.1.0.zip /abcm2ps-8.14.10.tar.gz /abcm2ps-8.14.11.tar.gz /abcm2ps-8.14.13.tar.gz -/abcm2ps-8.14.15.tar.gz -/abcplus_en-2024-07-10.zip diff --git a/abcm2ps-gnu23.patch b/abcm2ps-gnu23.patch deleted file mode 100644 index 1972076..0000000 --- a/abcm2ps-gnu23.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up ./abcm2ps-8.14.15/format.c.gnu23 ./abcm2ps-8.14.15/format.c ---- ./abcm2ps-8.14.15/format.c.gnu23 2024-01-08 02:15:18.000000000 -0500 -+++ ./abcm2ps-8.14.15/format.c 2025-01-24 16:13:01.068045837 -0500 -@@ -1158,13 +1158,13 @@ void interpret_fmt_line(char *w, /* key - } - if (strcmp(w, "writehistory") == 0) { /* compatibility */ - struct SYMBOL *s; -- int bool; -+ int ibool; - unsigned u; - -- bool = get_bool(p); -+ ibool = get_bool(p); - for (s = info['I' - 'A']; s != 0; s = s->next) { - u = s->text[0] - 'A'; -- if (bool) -+ if (ibool) - cfmt.fields[0] |= (1 << u); - else - cfmt.fields[0] &= ~(1 << u); -@@ -1215,7 +1215,7 @@ void interpret_fmt_line(char *w, /* key - } - break; - case 1: { /* %%writefields */ -- int bool; -+ int ibool; - unsigned u; - - q = p; -@@ -1223,7 +1223,7 @@ void interpret_fmt_line(char *w, /* key - p++; - while (isspace((unsigned char) *p)) - p++; -- bool = get_bool(p); -+ ibool = get_bool(p); - while (*q != '\0' && !isspace((unsigned char) *q)) { - u = *q - 'A'; - if (u < 26) { -@@ -1235,7 +1235,7 @@ void interpret_fmt_line(char *w, /* key - else - break; /*fixme: error */ - } -- if (bool) -+ if (ibool) - cfmt.fields[i] |= (1 << u); - else - cfmt.fields[i] &= ~(1 << u); diff --git a/abcm2ps.spec b/abcm2ps.spec index 50b3330..cd1ec05 100644 --- a/abcm2ps.spec +++ b/abcm2ps.spec @@ -1,14 +1,13 @@ Name: abcm2ps -Version: 8.14.15 -Release: 8%{?dist} +Version: 8.14.13 +Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +License: GPLv3 URL: http://moinejf.free.fr Source0: https://github.com/leesavide/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: https://sourceforge.net/projects/abcplus/files/Abcplus/abcplus_en-2024-07-10.zip -Patch0: abcm2ps-gnu23.patch +Source1: http://abcplus.sourceforge.net/abcplus_en-2012-03-30.zip +Source2: http://abcplus.sourceforge.net/abcplus_en-DRAFT3.pdf BuildRequires: gcc make %description @@ -30,7 +29,7 @@ Some sample ABC files with output as mp3, mid, and pdf. %prep %setup -q %setup -q -a 1 -%patch -P 0 -p 2 +cp -p %{SOURCE2} . %build %configure --enable-a4 @@ -48,7 +47,7 @@ make install \ %files -%doc INSTALL README.md _docs_staging/abcm2ps/* +%doc INSTALL README.md abcplus_en-DRAFT3.pdf _docs_staging/abcm2ps/* %license COPYING %{_bindir}/abcm2ps %{_datadir}/abcm2ps @@ -58,42 +57,9 @@ make install \ %doc abcplus_en*/* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 8.14.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 8.14.15-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Apr 12 2025 Stuart Gathman - 8.14.15-6 -- Update examples and pdf manual - -* Fri Jan 24 2025 Stuart Gathman - 8.14.15-5 -- Patch to compile with gcc-15 (gnu23) - -* Thu Jan 16 2025 Fedora Release Engineering - 8.14.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 8.14.15-3 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 8.14.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Apr 12 2024 Stuart Gathman - 8.14.15-1 -- New upstream release - * Sat Mar 12 2022 Stuart Gathman - 8.14.13-1 - New upstream release -* Wed Jan 19 2022 Fedora Release Engineering - 8.14.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 8.14.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 8.14.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Dec 22 2020 Stuart Gathman - 8.14.11-1 - New upstream release diff --git a/sources b/sources index 8578f41..bee64f3 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (abcm2ps-8.14.15.tar.gz) = 5466051b337328cccf9c12838aecfffc782e9906b7b659f4929c5da3af9d25eb67bf679720a924197cf0ffaae68e0bdc5e3e8efcc7614524fe954769379a79e1 -SHA512 (abcplus_en-2024-07-10.zip) = a1bf7b07d8be2c6497334c6c918fbf2fa62353d02781510ba24a7ebbc5b108e219824f1be8dd166f39f9bce883244b6d193c29b12df87b3106b3d0f1ceb05a4e +SHA512 (abcm2ps-8.14.13.tar.gz) = d48f44051aa62b3ee0dcd5cd4a32199d36d4ba056e6473b3c5eb378afabd40831f2a9abb2bbad2acb1c8bd3197a5b36177fabfb4e712b71589f835cba6c87c25 +SHA512 (abcplus_en-2012-03-30.zip) = 609e5aa3a682ea8873e1a0ff791085e01b646b355b88ef9096771266cc460d1f8045eb8d372cb64fd3fabd260a97bdcd5f6d23129104f508bfbbbcfa5ff03fa0 +SHA512 (abcplus_en-DRAFT3.pdf) = 927963934a41a1f7d25d59d10a1077b57a60f5c90a0eb066018894c7e4a05a0159f3cab276ec1323e65707ab9142d31da02f9962345d9a8a7c270206ccd4ef0d