.gitignore

@@ -4,9 +4,3 @@ abcplus_en-1.1.0.zip
 /abcm2ps-7.8.14.tar.gz
 /abcplus_en-2012-03-30.zip
 /abcplus_en-DRAFT3.pdf
-/abcm2ps-8.14.7.tar.gz
-/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

abcm2ps-gnu23.patch

@@ -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);

abcm2ps.spec

@@ -1,16 +1,16 @@
 Name:           abcm2ps
-Version:        8.14.15
+Version:        7.8.14
-Release:        8%{?dist}
+Release:        7%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
-# Automatically converted from old format: GPLv3 - review is highly recommended.
+Group:          Applications/Multimedia
-License:        GPL-3.0-only
+License:        GPLv2
 URL:            http://moinejf.free.fr
-Source0:        https://github.com/leesavide/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-%{version}.tar.gz
-Source1:        https://sourceforge.net/projects/abcplus/files/Abcplus/abcplus_en-2024-07-10.zip
+Source1:        http://abcplus.sourceforge.net/abcplus_en-2012-03-30.zip
-Patch0:		abcm2ps-gnu23.patch
+Source2:        http://abcplus.sourceforge.net/abcplus_en-DRAFT3.pdf
 
-BuildRequires:  gcc make
+BuildRequires:  gcc
 %description
 Abcm2ps is a package which converts music tunes from ABC format to
 Postscript. Based on abc2ps version 1.2.5, it was developed mainly to
@@ -19,112 +19,35 @@ or many keyboards and a pedal-board. Abcm2ps introduces many
 extensions to the ABC language that make it suitable for classical
 music.
 
-%package doc
-Summary: Example ABC files with output
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description doc
-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
-%make_build CFLAGS="%{optflags}"
+make %{?_smp_mflags}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install \
-     prefix=%{buildroot}%{_prefix} \
+     prefix=$RPM_BUILD_ROOT%{_prefix} \
-     bindir=%{buildroot}%{_bindir} \
+     bindir=$RPM_BUILD_ROOT%{_bindir} \
-     libdir=%{buildroot}%{_libdir} \
+     libdir=$RPM_BUILD_ROOT%{_libdir} \
-     datadir=%{buildroot}%{_datadir} \
+     datadir=$RPM_BUILD_ROOT%{_datadir} \
-     mandir=%{buildroot}%{_mandir} \
      docdir=$PWD/_docs_staging
 
 
+
 %files 
-%doc INSTALL README.md _docs_staging/abcm2ps/*
+%doc abcplus_en*/* _docs_staging/abcm2ps/* abcplus_en-DRAFT3.pdf
-%license COPYING
 %{_bindir}/abcm2ps
 %{_datadir}/abcm2ps
-%{_mandir}/man1/*
 
-%files doc
-%doc abcplus_en*/* 
 
 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.15-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.15-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Apr 12 2025 Stuart Gathman <stuart@gathman.org> - 8.14.15-6
-- Update examples and pdf manual
-
-* Fri Jan 24 2025 Stuart Gathman <stuart@gathman.org> - 8.14.15-5
-- Patch to compile with gcc-15 (gnu23)
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.15-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 8.14.15-3
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.15-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Apr 12 2024 Stuart Gathman <stuart@gathman.org> - 8.14.15-1
-- New upstream release
-
-* Sat Mar 12 2022 Stuart Gathman <stuart@gathman.org> - 8.14.13-1
-- New upstream release
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 22 2020 Stuart Gathman <stuart@gathman.org> - 8.14.11-1
-- New upstream release
-
-* Fri Nov 20 2020 Stuart Gathman <stuart@gathman.org> - 8.14.10-1
-- New upstream release
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.7-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.14.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 12 2020 Stuart Gathman <stuart@gathman.org> - 8.14.7-2
-- Move sample ABC output to subpackage
-
-* Tue May 12 2020 Stuart Gathman <stuart@gathman.org> - 8.14.7-1
-- New upstream release
-
-* Wed Apr 29 2020 Filipe Rosset <rosset.filipe@gmail.com> - 7.8.14-11
-- Fix FTBFS
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.14-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.14-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.14-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.14-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1,2 +1,3 @@
-SHA512 (abcm2ps-8.14.15.tar.gz) = 5466051b337328cccf9c12838aecfffc782e9906b7b659f4929c5da3af9d25eb67bf679720a924197cf0ffaae68e0bdc5e3e8efcc7614524fe954769379a79e1
+a7bbdbf20d85404289b26f5674c34df3  abcm2ps-7.8.14.tar.gz
-SHA512 (abcplus_en-2024-07-10.zip) = a1bf7b07d8be2c6497334c6c918fbf2fa62353d02781510ba24a7ebbc5b108e219824f1be8dd166f39f9bce883244b6d193c29b12df87b3106b3d0f1ceb05a4e
+2de66c5cedd41b4bf48a6025e0729cc7  abcplus_en-2012-03-30.zip
+a129d87e9c9143c85ee74137f309b4aa  abcplus_en-DRAFT3.pdf