From 8ea18fad9af93c28dee92f79ed97dd7de80695dc Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 27 Jan 2019 19:39:37 +0100
Subject: [PATCH 01/59] Remove obsolete scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 ocp.spec | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 0d6fd28..2495ab5 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -139,9 +139,6 @@ cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
 %{_datadir}/applications/*ocp.desktop
 %config(noreplace) /etc/ocp.ini
 
-%post
-/sbin/install-info %{_infodir}/ocp.info.gz %{_infodir}/dir || :
-
 %ifarch %{ix86}
 %if %{?_with_i386asm:1}%{!?_with_i386asm:0}
 # This is the i386 assembly version.  We need to allow text relocations.
@@ -162,11 +159,6 @@ restorecon -R %{_libdir}/ocp-* || :
 %endif
 
 
-%preun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/ocp.info.gz %{_infodir}/dir || :
-fi
-
 %postun
 if [ $1 -eq 0 ]; then  # final removal
 

From 53c7fecee7cfea1add6a8a64fd4d7576750e3632 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 17:02:00 +0000
Subject: [PATCH 02/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 2495ab5..8e7c6db 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.19.git%{shortcommit0}%{?dist}
+Release:	0.20.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -174,6 +174,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.20.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jul 23 2018 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.19.git849cc42
 - add BR gcc-c++
 

From 12b7f0f73d5327e2f3432bd75821233bd1c8a1af Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@wpi.edu>
Date: Tue, 5 Feb 2019 10:49:09 -0500
Subject: [PATCH 03/59] Patch configure to accept gcc 9

---
 ocp-0.1.22-configure-gcc-versions.patch | 4 ++--
 ocp.spec                                | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ocp-0.1.22-configure-gcc-versions.patch b/ocp-0.1.22-configure-gcc-versions.patch
index 41eab73..89f067f 100644
--- a/ocp-0.1.22-configure-gcc-versions.patch
+++ b/ocp-0.1.22-configure-gcc-versions.patch
@@ -7,7 +7,7 @@ index f206a3c..275afcb 100755
  			as_fn_error $? "not found" "$LINENO" 5;
  			;;
 -		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)
-+		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*)
++		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*)
  			_cc_major=`echo $cc_version | cut -d '.' -f 1`
  			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
  			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
@@ -20,7 +20,7 @@ index 2c82c4e..1e77fb3 100644
  			AC_MSG_ERROR([not found]);
  			;;
 -		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*)
-+		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*)
++		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*)
  			_cc_major=`echo $cc_version | cut -d '.' -f 1`
  			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
  			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff --git a/ocp.spec b/ocp.spec
index 8e7c6db..01cccd6 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.20.git%{shortcommit0}%{?dist}
+Release:	0.21.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -174,6 +174,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Feb 05 2019 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.21.git849cc42
+- Patch configure to accept gcc 9
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.20.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 80c2d12c630bc617d07f70397fd0c3183daea47a Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@wpi.edu>
Date: Tue, 5 Feb 2019 11:11:21 -0500
Subject: [PATCH 04/59] Fix broken %post section caused by rhbz#1663320 commit
 8ea18fad9af93c28dee92f79ed97dd7de80695dc Quote macro in comment

---
 ocp.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 01cccd6..f9849da 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.21.git%{shortcommit0}%{?dist}
+Release:	0.22.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -14,7 +14,7 @@ Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 # Graphics and animations are CC-BY.
 License:	GPLv2+ and CC-BY
 URL:		http://stian.cubic.org/project-ocp.php
-#Source0:	http://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
+#Source0:	http://stian.cubic.org/ocp/ocp-%%{version}.tar.bz2
 Source0:	http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-%{commit0}.zip
 Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
@@ -139,6 +139,8 @@ cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
 %{_datadir}/applications/*ocp.desktop
 %config(noreplace) /etc/ocp.ini
 
+
+%post
 %ifarch %{ix86}
 %if %{?_with_i386asm:1}%{!?_with_i386asm:0}
 # This is the i386 assembly version.  We need to allow text relocations.
@@ -174,6 +176,10 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Feb 05 2019 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.22.git849cc42
+- Fix broken %%post section caused by rhbz#1663320 commit 8ea18fad9af93c28dee92f79ed97dd7de80695dc
+- Quote macro in comment
+
 * Tue Feb 05 2019 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.21.git849cc42
 - Patch configure to accept gcc 9
 

From 66b0039f144d364928146e80b949f0ccab5a14a5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 23:05:32 +0000
Subject: [PATCH 05/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index f9849da..313b736 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.22.git%{shortcommit0}%{?dist}
+Release:	0.23.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -176,6 +176,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.23.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Feb 05 2019 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.22.git849cc42
 - Fix broken %%post section caused by rhbz#1663320 commit 8ea18fad9af93c28dee92f79ed97dd7de80695dc
 - Quote macro in comment

From ff46663249bc67b9592e4e7b43558fda0f58e5b0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 19:52:18 +0000
Subject: [PATCH 06/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 313b736..cdc91d0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.23.git%{shortcommit0}%{?dist}
+Release:	0.24.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -176,6 +176,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.24.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.23.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From b93a1ead48c817d7a6fe5b0af82f16daa6e83fa8 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@wpi.edu>
Date: Thu, 30 Jan 2020 13:16:28 -0500
Subject: [PATCH 07/59] patch out gcc version check

---
 ocp-0.1.22-configure-gcc-versions.patch | 26 ---------
 ocp-0.1.22-no-gcc-version-check.patch   | 72 +++++++++++++++++++++++++
 ocp.spec                                |  9 ++--
 3 files changed, 78 insertions(+), 29 deletions(-)
 delete mode 100644 ocp-0.1.22-configure-gcc-versions.patch
 create mode 100644 ocp-0.1.22-no-gcc-version-check.patch

diff --git a/ocp-0.1.22-configure-gcc-versions.patch b/ocp-0.1.22-configure-gcc-versions.patch
deleted file mode 100644
index 89f067f..0000000
--- a/ocp-0.1.22-configure-gcc-versions.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index f206a3c..275afcb 100755
---- a/configure
-+++ b/configure
-@@ -4612,7 +4612,7 @@ else
- 		'')
- 			as_fn_error $? "not found" "$LINENO" 5;
- 			;;
--		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)
-+		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*)
- 			_cc_major=`echo $cc_version | cut -d '.' -f 1`
- 			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
- 			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
-diff --git a/configure.ac b/configure.ac
-index 2c82c4e..1e77fb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,7 +119,7 @@ else
- 		'')
- 			AC_MSG_ERROR([not found]);
- 			;;
--		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*)
-+		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*)
- 			_cc_major=`echo $cc_version | cut -d '.' -f 1`
- 			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
- 			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff --git a/ocp-0.1.22-no-gcc-version-check.patch b/ocp-0.1.22-no-gcc-version-check.patch
new file mode 100644
index 0000000..c124c18
--- /dev/null
+++ b/ocp-0.1.22-no-gcc-version-check.patch
@@ -0,0 +1,72 @@
+diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac
+--- opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check	2020-01-30 13:12:45.762107178 -0500
++++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac	2020-01-30 13:13:31.678063513 -0500
+@@ -110,31 +110,6 @@ dnl restore prefix and exec_prefix
+   exec_prefix=$exec_prefix_save
+ ])
+ 
+-AC_MSG_CHECKING([gcc version])
+-cc_version=`( $CC -dumpversion ) 2>&1`
+-if test "$?" -gt 0 || test x$cc_version = x; then
+-	AC_MSG_ERROR([not found])
+-else
+-	case $cc_version in
+-		'')
+-			AC_MSG_ERROR([not found]);
+-			;;
+-		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*)
+-			_cc_major=`echo $cc_version | cut -d '.' -f 1`
+-			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
+-			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
+-			if test $_cc_major -gt 2; then
+-				AC_MSG_RESULT([$cc_version, ok])
+-			else
+-				AC_MSG_ERROR([$cc_version, bad])
+-			fi
+-			;;
+-		*)
+-			AC_MSG_ERROR([$cc_version, bad])
+-			;;
+-       esac
+-fi
+-
+ AC_MSG_CHECKING([for broken signed char to signed int in loops (gcc version 4.1.1)])
+ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([
+diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
+--- opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check	2020-01-30 13:12:45.764107176 -0500
++++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure	2020-01-30 13:13:43.004052695 -0500
+@@ -4602,33 +4602,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+ 
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
+-$as_echo_n "checking gcc version... " >&6; }
+-cc_version=`( $CC -dumpversion ) 2>&1`
+-if test "$?" -gt 0 || test x$cc_version = x; then
+-	as_fn_error $? "not found" "$LINENO" 5
+-else
+-	case $cc_version in
+-		'')
+-			as_fn_error $? "not found" "$LINENO" 5;
+-			;;
+-		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)
+-			_cc_major=`echo $cc_version | cut -d '.' -f 1`
+-			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
+-			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
+-			if test $_cc_major -gt 2; then
+-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
+-$as_echo "$cc_version, ok" >&6; }
+-			else
+-				as_fn_error $? "$cc_version, bad" "$LINENO" 5
+-			fi
+-			;;
+-		*)
+-			as_fn_error $? "$cc_version, bad" "$LINENO" 5
+-			;;
+-       esac
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken signed char to signed int in loops (gcc version 4.1.1)" >&5
+ $as_echo_n "checking for broken signed char to signed int in loops (gcc version 4.1.1)... " >&6; }
+ if test "$cross_compiling" = yes; then :
diff --git a/ocp.spec b/ocp.spec
index cdc91d0..b47d858 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.24.git%{shortcommit0}%{?dist}
+Release:	0.25.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -20,7 +20,7 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Patch0:		ocp-0.1.20-no-i386-asm.patch
 Patch1:		ocp-0.1.21-pat-use-first-sample.patch
-Patch2:		ocp-0.1.22-configure-gcc-versions.patch
+Patch2:		ocp-0.1.22-no-gcc-version-check.patch
 
 BuildRequires:	adplug-devel
 BuildRequires:	alsa-lib-devel
@@ -64,7 +64,7 @@ visualizations.
 %patch0 -p1 -b .noi386asm
 %endif
 %patch1 -p1 -b .pat
-%patch2 -p1 -b .gcc6-gcc7
+%patch2 -p1 -b .no-gcc-version-check
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -176,6 +176,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Thu Jan 30 2020 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.25.git849cc42
+- patch out configure gcc version check
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.24.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 8e7c8c7b9457ddc35433200e92a399f34c2f7e30 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 14 Jul 2020 02:18:13 +0000
Subject: [PATCH 08/59] Use make macros

https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
---
 ocp.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index b47d858..1cb7498 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.25.git%{shortcommit0}%{?dist}
+Release:	0.26.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -93,7 +93,7 @@ make
 
 %install
 mkdir -p %{buildroot}/etc
-make install DESTDIR=%{buildroot}
+%make_install
 
 # rename ultrafix.sh script to make it obvious that it belongs to this
 # package and avoid conflicts.
@@ -176,6 +176,10 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.1.22-0.26.git849cc42
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
 * Thu Jan 30 2020 Charles R. Anderson <cra@wpi.edu> - 0.1.22-0.25.git849cc42
 - patch out configure gcc version check
 

From 9a7c30efc27613a9368b59efe85e083a1308b01f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 12:23:42 +0000
Subject: [PATCH 09/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 1cb7498..f1eeb3f 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.26.git%{shortcommit0}%{?dist}
+Release:	0.27.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -176,6 +176,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.27.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.1.22-0.26.git849cc42
 - Use make macros
 - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

From f2e84f5d8134d99c5d291dd6d5b6153001735f85 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 5 Jan 2021 05:09:03 +0100
Subject: [PATCH 10/59] Rebuilt for adplug 2.3.3

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index f1eeb3f..2fdf0b3 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.27.git%{shortcommit0}%{?dist}
+Release:	0.28.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -176,6 +176,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Jan 05 2021 Robert Scheck <robert@fedoraproject.org> - 0.1.22-0.28.git849cc42
+- Rebuilt for adplug 2.3.3
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.27.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 3df7bf9d261390f41632963731fe57eaae7f1f2a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 7 Jan 2021 06:20:40 +0000
Subject: [PATCH 11/59] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 ocp.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ocp.spec b/ocp.spec
index 2fdf0b3..bc50afc 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -22,6 +22,7 @@ Patch0:		ocp-0.1.20-no-i386-asm.patch
 Patch1:		ocp-0.1.21-pat-use-first-sample.patch
 Patch2:		ocp-0.1.22-no-gcc-version-check.patch
 
+BuildRequires: make
 BuildRequires:	adplug-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	desktop-file-utils

From babef5de8eb0d3c4a28e00fed5a1e2d8b0c77531 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 22:12:15 +0000
Subject: [PATCH 12/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index bc50afc..019f4ae 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.28.git%{shortcommit0}%{?dist}
+Release:	0.29.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.29.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jan 05 2021 Robert Scheck <robert@fedoraproject.org> - 0.1.22-0.28.git849cc42
 - Rebuilt for adplug 2.3.3
 

From 8c9a4a7f13a95f8f32d0639753fcf0cf116e68bf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 16:53:49 +0000
Subject: [PATCH 13/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 019f4ae..a93c3b0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.29.git%{shortcommit0}%{?dist}
+Release:	0.30.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.30.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.29.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 9bf9ed1382b91b4d84143853fdf15bcbceb70ec4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 22:01:50 +0000
Subject: [PATCH 14/59] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index a93c3b0..d953686 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.1.22
-Release:	0.30.git%{shortcommit0}%{?dist}
+Release:	0.31.git%{shortcommit0}%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ if [ $1 -eq 0 ]; then  # final removal
 fi
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.31.git849cc42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.30.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From fd3fb9ff056f2bad859812f49db629ded690159e Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 26 Mar 2022 14:33:12 -0400
Subject: [PATCH 15/59] Remove possibility to build i386 assembly version

New upstream on github
Update to 0.2.1
---
 .gitignore                                    |  1 +
 ocp-0.1.20-docdir.patch                       | 53 ------------
 ocp-0.1.20-no-i386-asm.patch                  | 12 ---
 ocp-0.1.20-timidity-parse-config.patch        | 30 -------
 ocp-0.1.21-pat-use-first-sample.patch         | 13 ---
 ocp-0.1.22-timidity-parse-config.patch        | 64 --------------
 ...ch => ocp-0.2.1-no-gcc-version-check.patch | 20 ++---
 ocp-0.2.1-no-i386-asm.patch                   | 12 +++
 ocp.spec                                      | 86 +++++--------------
 sources                                       |  6 +-
 10 files changed, 49 insertions(+), 248 deletions(-)
 delete mode 100644 ocp-0.1.20-docdir.patch
 delete mode 100644 ocp-0.1.20-no-i386-asm.patch
 delete mode 100644 ocp-0.1.20-timidity-parse-config.patch
 delete mode 100644 ocp-0.1.21-pat-use-first-sample.patch
 delete mode 100644 ocp-0.1.22-timidity-parse-config.patch
 rename ocp-0.1.22-no-gcc-version-check.patch => ocp-0.2.1-no-gcc-version-check.patch (60%)
 create mode 100644 ocp-0.2.1-no-i386-asm.patch

diff --git a/.gitignore b/.gitignore
index 3c98ad8..353b674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ opencp25image1.zip
 /ocp-0.1.22-20150224gita07bf5d.tar.bz2
 /opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip
 /opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
+/ocp-0.2.1.tar.bz2
diff --git a/ocp-0.1.20-docdir.patch b/ocp-0.1.20-docdir.patch
deleted file mode 100644
index 1aedbc0..0000000
--- a/ocp-0.1.20-docdir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up ocp-0.1.20/doc/texi/Makefile.docdir ocp-0.1.20/doc/texi/Makefile
---- ocp-0.1.20/doc/texi/Makefile.docdir	2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/doc/texi/Makefile	2013-08-06 18:04:28.506454302 -0400
-@@ -19,12 +19,12 @@ install: all
- 	mkdir -p "$(DESTDIR)$(INFODIR)"
- 	$(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)"
- 	install-info --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" || true
--	mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
--	$(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
-+	mkdir -p "$(DESTDIR)$(DOCDIR)/html"
-+	$(CP) -R ocp.html/* "$(DESTDIR)$(DOCDIR)/html"
- uninstall:
- 	install-info --delete --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz"
- 	rm -f "$(DESTDIR)$(INFODIR)/ocp.info.gz"
--	rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
-+	rm -Rf "$(DESTDIR)$(DOCDIR)/html"
- else
- all:
- 
-diff -up ocp-0.1.20/Makefile.in.docdir ocp-0.1.20/Makefile.in
---- ocp-0.1.20/Makefile.in.docdir	2010-05-17 05:55:17.000000000 -0400
-+++ ocp-0.1.20/Makefile.in	2013-08-06 18:00:54.994677835 -0400
-@@ -35,8 +35,8 @@ endif
- 
- 
- install: all
--	mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
--	$(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
-+	mkdir -p "$(DESTDIR)$(DOCDIR)"
-+	$(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(DOCDIR)"
- 	mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
- 	$(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
- 	mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/etc"
-@@ -131,7 +131,7 @@ endif
- 	$(MAKE) -C stuff TOPDIR=../$(TOPDIR) uninstall
- 	$(MAKE) -C medialib TOPDIR=../$(TOPDIR) uninstall
- 	$(MAKE) -C doc TOPDIR="../$(TOPDIR)" uninstall
--	rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp" "$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl" "$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11" "$(DESTDIR)$(BINDIR)/ultrafix.sh"
-+	rm -Rf "$(DESTDIR)$(DOCDIR)" "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp" "$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl" "$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11" "$(DESTDIR)$(BINDIR)/ultrafix.sh"
- 	rm -f "$(DESTDIR)$(PREFIX)/share/applications/opencubicplayer.desktop" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/opencubicplayer.xpm" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/opencubicplayer.xpm"
- 
- dirs:
-diff -up ocp-0.1.20/Rules.make.in.docdir ocp-0.1.20/Rules.make.in
---- ocp-0.1.20/Rules.make.in.docdir	2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/Rules.make.in	2013-08-06 18:00:54.994677835 -0400
-@@ -4,6 +4,7 @@ PREFIX=@PREFIX@
- LIBDIR=@LIBDIR@
- INFODIR=@INFODIR@
- BINDIR=@BINDIR@
-+DOCDIR=@docdir@
- SYSCONFDIR=@SYSCONFDIR@
- DESKTOP_FILE_INSTALL=@DESKTOP_FILE_INSTALL@
- 
diff --git a/ocp-0.1.20-no-i386-asm.patch b/ocp-0.1.20-no-i386-asm.patch
deleted file mode 100644
index e13ba2e..0000000
--- a/ocp-0.1.20-no-i386-asm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ocp-0.1.20/config.h.in.noi386asm ocp-0.1.20/config.h.in
---- ocp-0.1.20/config.h.in.noi386asm	2010-05-17 05:55:17.000000000 -0400
-+++ ocp-0.1.20/config.h.in	2011-06-05 20:59:44.866924202 -0400
-@@ -125,7 +125,7 @@
- #undef HAVE_RESIZETERM
- 
- #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
--#define I386_ASM 1
-+/* #define I386_ASM */
- #endif
- 
- /* #define I386_ASM_EMU 1 */
diff --git a/ocp-0.1.20-timidity-parse-config.patch b/ocp-0.1.20-timidity-parse-config.patch
deleted file mode 100644
index d77d117..0000000
--- a/ocp-0.1.20-timidity-parse-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up ocp-0.1.20/playgmi/gmitimidity.c.timidity ocp-0.1.20/playgmi/gmitimidity.c
---- ocp-0.1.20/playgmi/gmitimidity.c.timidity	2010-05-17 05:55:16.000000000 -0400
-+++ ocp-0.1.20/playgmi/gmitimidity.c	2011-06-01 23:36:26.491647508 -0400
-@@ -56,7 +56,7 @@ static void parse_config(FILE *input, in
- 		if ((pos=strchr(line, '#')))
- 			*pos=0;
- 		base=line;
--		while ((*base)&&(*base==' '))
-+		while ((*base)&&isspace(*base))
- 			base++;
- 		if (!base)
- 			continue;
-@@ -184,7 +184,7 @@ static int loadpatchTimidity( struct min
- 		fprintf(stderr, "[timidity] not entry configured for program %d\n", program);
- 		return errFileMiss;
- 	}
--	for (i=DirectoryStackIndex-1;i>=0;i--)
-+	for (i=DirectoryStackIndex;i>=0;i--)
- 	{
- 		snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i], midInstrumentNames[program]);
- 		if ((file=fopen(path, "r"))!=NULL)
-@@ -220,7 +220,7 @@ static int addpatchTimidity( struct mins
- 		fprintf(stderr, "[timidity] not entry configured for program %d\n", program);
- 		return errFileMiss;
- 	}
--	for (i=DirectoryStackIndex-1;i>=0;i--)
-+	for (i=DirectoryStackIndex;i>=0;i--)
- 	{
- 		snprintf(path, sizeof(path), "%s/%s.pat", DirectoryStack[i], midInstrumentNames[program]);
- 		if ((file=fopen(path, "r"))!=NULL)
diff --git a/ocp-0.1.21-pat-use-first-sample.patch b/ocp-0.1.21-pat-use-first-sample.patch
deleted file mode 100644
index 6c0d5cf..0000000
--- a/ocp-0.1.21-pat-use-first-sample.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up ocp-0.1.21/playgmi/gmipat.c.pat ocp-0.1.21/playgmi/gmipat.c
---- ocp-0.1.21/playgmi/gmipat.c.pat	2011-11-17 16:46:08.000000000 -0500
-+++ ocp-0.1.21/playgmi/gmipat.c	2013-12-27 23:46:56.436929356 -0500
-@@ -370,7 +370,8 @@ addpatchPAT (FILE               *file,
- 	if (lh.samples!=1)
- 	{
- 		fprintf(stderr, "[*.PAT loader] # Samples != 1\n");
--		return errFormStruc;
-+		/* return errFormStruc; */
-+		lh.samples=1; /* only use the first sample */
- 	}
- 
- 	if ((st=loadsamplePAT(file, ins, sn, ph.voices, 0, sampnum, 0, sip, samplenum)))
diff --git a/ocp-0.1.22-timidity-parse-config.patch b/ocp-0.1.22-timidity-parse-config.patch
deleted file mode 100644
index f4304d9..0000000
--- a/ocp-0.1.22-timidity-parse-config.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c.timidity ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c
---- ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c.timidity	2015-02-23 22:38:38.000000000 -0500
-+++ ocp-0.1.22-20150223gitbceb98e/playgmi/gmitimidity.c	2015-02-24 00:04:03.464743077 -0500
-@@ -200,7 +200,7 @@ static int loadpatchTimidity( struct min
- 	if (len >= 4)
- 		needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
- 
--	if (midInstrumentNames[program][0] != '/') /* Is the path absolute? */
-+	if (midInstrumentNames[program][0] == '/') /* Is the path absolute? */
- 	{
- 		snprintf(path, sizeof(path), "%s%s", midInstrumentNames[program], needpat?".pat":"");
- 
-@@ -241,28 +241,41 @@ static int addpatchTimidity( struct mins
- 	int retval;
- 	char path[PATH_MAX+NAME_MAX];
- 	int i;
-+	int needpat = 1;
-+	int len;
- 
- 	if (!*midInstrumentNames[program])
- 	{
- 		fprintf(stderr, "[timidity] not entry configured for program %d\n", program);
- 		return errFileMiss;
- 	}
--	for (i=DirectoryStackIndex-1;i>=0;i--)
-+
-+	len = strlen(midInstrumentNames[program]);
-+	if (len >= 4)
-+		needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
-+
-+	if (midInstrumentNames[program][0] == '/') /* Is the path absolute? */
- 	{
--		int needpat = 1;
--		int len = strlen(midInstrumentNames[program]);
--		if (len >= 4)
--			needpat = strcasecmp(midInstrumentNames[program]+len-4, ".pat");
--		snprintf(path, sizeof(path), "%s/%s%s", DirectoryStack[i], midInstrumentNames[program], needpat?".pat":"");
--		if ((file=fopen(path, "r"))!=NULL)
--			break;
-+		snprintf(path, sizeof(path), "%s%s", midInstrumentNames[program], needpat?".pat":"");
-+
-+		if ((file=fopen(path, "r"))==NULL)
-+		{
-+			fprintf(stderr, "[timidity] '%s': failed to open file\n", path);
-+		}
-+	} else {
-+	        for (i=DirectoryStackIndex-1;i>=0;i--)
-+		{
-+			snprintf(path, sizeof(path), "%s/%s%s", DirectoryStack[i], midInstrumentNames[program], needpat?".pat":"");
-+			if ((file=fopen(path, "r"))!=NULL)
-+				break;
-+			fprintf(stderr, "[timidity] '%s': failed to open file (we might try other directory prefixes before we give up)\n", path);
-+		}
- 	}
- 	if (!file)
- 	{
--		fprintf(stderr, "[timidity] '%s': failed to open file\n", midInstrumentNames[program]);
-+		fprintf(stderr, "[timidity] failed to open instrument %s\n", midInstrumentNames[program]);
- 		return errFileMiss;
- 	}
--
- 	fprintf(stderr, "[timidity] loading file %s\n", path);
- 	retval=addpatchPAT(file, ins, program, sn, sampnum, sip, samplenum);
- 	fclose(file);
diff --git a/ocp-0.1.22-no-gcc-version-check.patch b/ocp-0.2.1-no-gcc-version-check.patch
similarity index 60%
rename from ocp-0.1.22-no-gcc-version-check.patch
rename to ocp-0.2.1-no-gcc-version-check.patch
index c124c18..8e3f480 100644
--- a/ocp-0.1.22-no-gcc-version-check.patch
+++ b/ocp-0.2.1-no-gcc-version-check.patch
@@ -1,7 +1,7 @@
-diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac
---- opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac.no-gcc-version-check	2020-01-30 13:12:45.762107178 -0500
-+++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.ac	2020-01-30 13:13:31.678063513 -0500
-@@ -110,31 +110,6 @@ dnl restore prefix and exec_prefix
+diff -up ocp-0.2.1/configure.ac.no-gcc-version-check ocp-0.2.1/configure.ac
+--- ocp-0.2.1/configure.ac.no-gcc-version-check	2020-02-08 19:05:13.993537420 -0500
++++ ocp-0.2.1/configure.ac	2020-02-08 19:07:17.088275191 -0500
+@@ -123,31 +123,6 @@ dnl restore prefix and exec_prefix
    exec_prefix=$exec_prefix_save
  ])
  
@@ -14,7 +14,7 @@ diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
 -		'')
 -			AC_MSG_ERROR([not found]);
 -			;;
--		2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*)
+-		2.95.[[2-9]]|2.95.[[2-9]][[-]].*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*|10*)
 -			_cc_major=`echo $cc_version | cut -d '.' -f 1`
 -			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
 -			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
@@ -33,10 +33,10 @@ diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
  AC_MSG_CHECKING([for broken signed char to signed int in loops (gcc version 4.1.1)])
  AC_RUN_IFELSE(
  [AC_LANG_SOURCE([
-diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
---- opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure.no-gcc-version-check	2020-01-30 13:12:45.764107176 -0500
-+++ opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure	2020-01-30 13:13:43.004052695 -0500
-@@ -4602,33 +4602,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+diff -up ocp-0.2.1/configure.no-gcc-version-check ocp-0.2.1/configure
+--- ocp-0.2.1/configure.no-gcc-version-check	2020-02-08 19:05:13.994537418 -0500
++++ ocp-0.2.1/configure	2020-02-08 19:06:53.973324507 -0500
+@@ -6141,33 +6141,6 @@ test "x$exec_prefix" = xNONE && exec_pre
  
  
  
@@ -50,7 +50,7 @@ diff -up opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91/configure
 -		'')
 -			as_fn_error $? "not found" "$LINENO" 5;
 -			;;
--		2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)
+-		2.95.[2-9]|2.95.[2-9][-].*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*|10*)
 -			_cc_major=`echo $cc_version | cut -d '.' -f 1`
 -			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
 -			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff --git a/ocp-0.2.1-no-i386-asm.patch b/ocp-0.2.1-no-i386-asm.patch
new file mode 100644
index 0000000..c56983b
--- /dev/null
+++ b/ocp-0.2.1-no-i386-asm.patch
@@ -0,0 +1,12 @@
+diff -up opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in
+--- opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm	2020-02-08 18:53:55.627986645 -0500
++++ opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in	2020-02-08 18:55:42.158758052 -0500
+@@ -161,7 +161,7 @@
+ #undef HAVE_RESIZE_TERM
+ 
+ #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
+-#define I386_ASM 1
++/* #define I386_ASM */
+ #endif
+ 
+ /* #define I386_ASM_EMU 1 */
diff --git a/ocp.spec b/ocp.spec
index d953686..3987b97 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,14 @@
-%global commit0 849cc42c9446f68935269d6cc039dfd46e620f91
-%global gittag0 0.1.22
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#global commit0 47ee5f8669c9bf88b64852f3ab50d9a244c3932f
+#global gittag0 0.2.1
+#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
+%define _legacy_common_support 1
 %global _hardened_build 1
 
 Name:		ocp
-Version:	0.1.22
-Release:	0.31.git%{shortcommit0}%{?dist}
+Version:	0.2.1
+Release:	2%{?dist}
+#Release:	0.1.git%%{shortcommit0}%%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -14,15 +16,15 @@ Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 # Graphics and animations are CC-BY.
 License:	GPLv2+ and CC-BY
 URL:		http://stian.cubic.org/project-ocp.php
-#Source0:	http://stian.cubic.org/ocp/ocp-%%{version}.tar.bz2
-Source0:	http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-%{commit0}.zip
+Source0:	http://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
+#Source0:	http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-%%{commit0}.zip
+#Source0:	https://github.com/mywave82/opencubicplayer/archive/%{commit0}/opencubicplayer-%{shortcommit0}.tar.gz 
 Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
-Patch0:		ocp-0.1.20-no-i386-asm.patch
-Patch1:		ocp-0.1.21-pat-use-first-sample.patch
-Patch2:		ocp-0.1.22-no-gcc-version-check.patch
+Patch0:		ocp-0.2.1-no-i386-asm.patch
+Patch1:		ocp-0.2.1-no-gcc-version-check.patch
 
-BuildRequires: make
+BuildRequires:	make
 BuildRequires:	adplug-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	desktop-file-utils
@@ -43,13 +45,6 @@ BuildRequires:	zlib-devel
 # For the hicolor icon directories
 Requires:	hicolor-icon-theme
 
-Requires(post):	info
-Requires(preun): info
-%ifarch %{ix86}
-Requires(post): /usr/sbin/semanage
-Requires(post): /sbin/restorecon
-%endif
-
 %description
 Open Cubic Player is a music file player ported from DOS that supports
 Amiga MOD module formats and many variants, such as MTM, STM, 669,
@@ -60,12 +55,10 @@ visualizations.
 
 
 %prep
-%setup -q -n opencubicplayer-code-%{commit0}
-%if %{?_with_i386asm:0}%{!?_with_i386asm:1}
+%setup -q
+#-n opencubicplayer-%%{commit0}
 %patch0 -p1 -b .noi386asm
-%endif
-%patch1 -p1 -b .pat
-%patch2 -p1 -b .no-gcc-version-check
+%patch1 -p1 -b .no-gcc-version-check
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -96,10 +89,6 @@ make
 mkdir -p %{buildroot}/etc
 %make_install
 
-# rename ultrafix.sh script to make it obvious that it belongs to this
-# package and avoid conflicts.
-mv %{buildroot}%{_bindir}/ultrafix.sh %{buildroot}%{_bindir}/ocp-ultrafix.sh
-
 # mv config to /etc (ocp will search here if it isn't found in the original location)
 mv %{buildroot}%{_datadir}/%{name}-%{version}/etc/ocp.ini %{buildroot}/etc/ocp.ini
 rmdir %{buildroot}%{_datadir}/%{name}-%{version}/etc
@@ -133,7 +122,6 @@ cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
 %{_bindir}/ocp-sdl
 %{_bindir}/ocp-vcsa
 %{_bindir}/ocp-x11
-%{_bindir}/ocp-ultrafix.sh
 %{_infodir}/ocp.info*
 %{_datadir}/icons/hicolor/16x16/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -141,42 +129,14 @@ cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
 %config(noreplace) /etc/ocp.ini
 
 
-%post
-%ifarch %{ix86}
-%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
-# This is the i386 assembly version.  We need to allow text relocations.
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
-semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -a -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
-%else
-# This is the i386 non-assembly version.  We don't need nor want to allow text relocations.
-semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
-semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
-%endif
-restorecon -R %{_libdir}/ocp-* || :
-%endif
-
-
-%postun
-if [ $1 -eq 0 ]; then  # final removal
-
-%ifarch %{ix86}
-%if %{?_with_i386asm:1}%{!?_with_i386asm:0}
-    semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
-    semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
-    semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
-    semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-    semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
-%endif
-%endif
-fi
-
 %changelog
+* Sat Mar 26 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.1-2
+- Remove possibility to build i386 assembly version
+
+* Thu Mar 17 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.1-1
+- New upstream on github
+- Update to 0.2.1
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.22-0.31.git849cc42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index b266627..33a9378 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c69076f0392015878df34eefdfb4967e  opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
-4df5f894e070b20d8cd65a1a620258cb  opencp25ani1.zip
-72bd5f59382e927ff5b5ba1b840777df  opencp25image1.zip
+SHA512 (ocp-0.2.1.tar.bz2) = fd8e6f29cf9512810919bc97f2f41ec4b964acbb1662a7952371d81f2880b0dc05e884450d47fd2c8fe1a6447c3ec8c3a3b1f52eb0d0e75a2b5a46c233b133cd
+SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
+SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 18b7533559538aedf294b73de7829bca1b96c9f3 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sun, 27 Mar 2022 00:11:40 -0400
Subject: [PATCH 16/59] update to 0.2.95

disable X11, OSS, and SDL
enable SDL2
patch ocp.ini to remove references to drivers that are not packaged
add dumptools: dumpahx dumpay dumpmidi dumpmod dumps3m dumpsid dumpstm
build with unversioned private datadir and libdir
Provides bundled(libsidplayfp) and bundled(timidity++)
mark license files
spec file cleanups and modernization
---
 .gitignore                    |   1 +
 ocp-0.2.95-ini-optimize.patch |  12 ++++
 ocp.spec                      | 109 ++++++++++++++++++++--------------
 sources                       |   2 +-
 4 files changed, 80 insertions(+), 44 deletions(-)
 create mode 100644 ocp-0.2.95-ini-optimize.patch

diff --git a/.gitignore b/.gitignore
index 353b674..f69f935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ opencp25image1.zip
 /opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip
 /opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
 /ocp-0.2.1.tar.bz2
+/ocp-0.2.95.tar.bz2
diff --git a/ocp-0.2.95-ini-optimize.patch b/ocp-0.2.95-ini-optimize.patch
new file mode 100644
index 0000000..8b665db
--- /dev/null
+++ b/ocp-0.2.95-ini-optimize.patch
@@ -0,0 +1,12 @@
+diff -up ocp-0.2.95/ocp.ini.in.optimize ocp-0.2.95/ocp.ini.in
+--- ocp-0.2.95/ocp.ini.in.optimize	2022-03-21 16:19:44.000000000 -0400
++++ ocp-0.2.95/ocp.ini.in	2022-03-26 20:42:24.824581501 -0400
+@@ -22,7 +22,7 @@
+ ; (8 chars only)
+ ; note: the first device found in each list will be uses as default
+ 
+-  playerdevices=devpALSA devpOSS devpCA devpSDL2 devpSDL devpNone devpDisk
++  playerdevices=devpALSA devpSDL2 devpNone devpDisk
+   wavetabledevices=devwMixF devwmixQ devwMix devwNone
+   mixrate=44100           ; -sr44100
+   mixprocrate=4096000     ; max channels*rate (for slow cpus) (4096000==64*64000)
diff --git a/ocp.spec b/ocp.spec
index 3987b97..42010ff 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,49 +1,50 @@
-#global commit0 47ee5f8669c9bf88b64852f3ab50d9a244c3932f
-#global gittag0 0.2.1
-#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
-
-%define _legacy_common_support 1
-%global _hardened_build 1
-
 Name:		ocp
-Version:	0.2.1
-Release:	2%{?dist}
-#Release:	0.1.git%%{shortcommit0}%%{?dist}
+Version:	0.2.95
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
 # GPLv2+ license text to all source files.
 # Graphics and animations are CC-BY.
 License:	GPLv2+ and CC-BY
-URL:		http://stian.cubic.org/project-ocp.php
-Source0:	http://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
-#Source0:	http://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-%%{commit0}.zip
-#Source0:	https://github.com/mywave82/opencubicplayer/archive/%{commit0}/opencubicplayer-%{shortcommit0}.tar.gz 
+URL:		https://stian.cubic.org/project-ocp.php
+Source0:	https://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
 Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
-Patch0:		ocp-0.2.1-no-i386-asm.patch
-Patch1:		ocp-0.2.1-no-gcc-version-check.patch
+Patch0:		ocp-0.2.95-ini-optimize.patch
 
-BuildRequires:	make
-BuildRequires:	adplug-devel
+BuildRequires:	adplug-devel >= 2.3.1
 BuildRequires:	alsa-lib-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	cjson-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	flac-devel
+BuildRequires:	freetype-devel
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
+BuildRequires:	libbinio-devel >= 1.5
+BuildRequires:	libdiscid-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libXext-devel
-BuildRequires:	libXpm-devel
-BuildRequires:	libXxf86vm-devel
+BuildRequires:	make
 BuildRequires:	ncurses-devel
-BuildRequires:	SDL-devel
+BuildRequires:	perl-interpreter
+BuildRequires:	SDL2-devel
 BuildRequires:	texinfo
+BuildRequires:	unifont-fonts
+BuildRequires:	unzip
+BuildRequires:	xa
 BuildRequires:	zlib-devel
 
 # For the hicolor icon directories
 Requires:	hicolor-icon-theme
+Requires:	unifont-fonts
+
+# Bundled code
+Provides:	bundled(timidity++) = 2.15.0
+Provides:	bundled(libsidplayfp) = 2.3.1
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
@@ -55,10 +56,7 @@ visualizations.
 
 
 %prep
-%setup -q
-#-n opencubicplayer-%%{commit0}
-%patch0 -p1 -b .noi386asm
-%patch1 -p1 -b .no-gcc-version-check
+%autosetup
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -66,23 +64,28 @@ mv license.txt license-videos.txt
 
 
 %build
-%configure --with-x11 \
+%configure --without-x11 \
 	   --with-adplug \
 	   --with-alsa \
 	   --without-coreaudio \
-	   --with-oss \
+	   --without-oss \
 	   --with-lzw \
 	   --with-lzh \
 	   --with-flac \
-	   --with-sdl \
+	   --without-sdl \
+	   --with-sdl2 \
 	   --with-mad \
 	   --with-libiconv=auto \
+	   --with-timidity-default-path=/etc \
+	   --with-unifontdir=/usr/share/fonts/unifont \
+	   --without-unifont-csur-ttf \
+	   --with-dumptools \
+	   --with-dir-suffix= \
 	   --docdir=%{_pkgdocdir} \
 #	   --with-debug
-
-make
 # Makefiles are not SMP-clean
-#{?_smp_mflags}
+%global _smp_mflags -j1
+%make_build
 
 
 %install
@@ -90,8 +93,8 @@ mkdir -p %{buildroot}/etc
 %make_install
 
 # mv config to /etc (ocp will search here if it isn't found in the original location)
-mv %{buildroot}%{_datadir}/%{name}-%{version}/etc/ocp.ini %{buildroot}/etc/ocp.ini
-rmdir %{buildroot}%{_datadir}/%{name}-%{version}/etc
+mv %{buildroot}%{_datadir}/%{name}/etc/ocp.ini %{buildroot}/etc/ocp.ini
+rmdir %{buildroot}%{_datadir}/%{name}/etc
 
 # remove info/dir
 rm -f %{buildroot}/%{_infodir}/dir
@@ -107,29 +110,49 @@ desktop-file-install --add-category="Audio" \
 		     %{buildroot}%{_datadir}/applications/ocp.desktop
 
 # install images and animations
-mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/data
-cp -p CPPIC*.TGA CPANI*.DAT %{buildroot}%{_datadir}/%{name}-%{version}/data
-cp -p license-images.txt license-videos.txt %{buildroot}%{_pkgdocdir}
+cp -p CPPIC*.TGA CPANI*.DAT %{buildroot}%{_datadir}/%{name}/data
+
+# remove COPYING from buildroot/docdir as it will be installed as a license file below
+rm -f %{buildroot}%{_pkgdocdir}/COPYING
+
 
 %files
+%license COPYING license-images.txt license-videos.txt
 # install already installs the docs here for us
 %doc %{_pkgdocdir}
-%{_datadir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}
-%{_bindir}/ocp-%{version}
+%{_datadir}/%{name}
+%{_libdir}/%{name}
 %{_bindir}/ocp
 %{_bindir}/ocp-curses
-%{_bindir}/ocp-sdl
+%{_bindir}/ocp-sdl2
 %{_bindir}/ocp-vcsa
-%{_bindir}/ocp-x11
+%{_bindir}/dump*
 %{_infodir}/ocp.info*
+%{_mandir}/man1/ocp.1*
 %{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/64x64/apps/*
+%{_datadir}/icons/hicolor/128x128/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/applications/*ocp.desktop
 %config(noreplace) /etc/ocp.ini
 
 
 %changelog
+* Sat Mar 26 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.95-1
+- update to 0.2.95
+- disable X11, OSS, and SDL
+- enable SDL2
+- patch ocp.ini to remove references to drivers that are not packaged
+- add dumptools: dumpahx dumpay dumpmidi dumpmod dumps3m dumpsid dumpstm
+- build with unversioned private datadir and libdir
+- Provides bundled(libsidplayfp) and bundled(timidity++)
+- mark license files
+- spec file cleanups and modernization
+
 * Sat Mar 26 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.1-2
 - Remove possibility to build i386 assembly version
 
diff --git a/sources b/sources
index 33a9378..10f762a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.1.tar.bz2) = fd8e6f29cf9512810919bc97f2f41ec4b964acbb1662a7952371d81f2880b0dc05e884450d47fd2c8fe1a6447c3ec8c3a3b1f52eb0d0e75a2b5a46c233b133cd
+SHA512 (ocp-0.2.95.tar.bz2) = 696147defff6f8c6c5ba782c2a8b2f67a06234d6bd4e9d43ce55c3d372233fab988da7cbd9ce12b4d52663fa9cdc91f8abfd1206aae4a1295087544853c02a8b
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From f2b30b3163f84e38d76c4b38c5dfee82c38b2f13 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Tue, 3 May 2022 12:03:47 -0400
Subject: [PATCH 17/59] update to 0.2.96

---
 ocp.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 42010ff..1886d9c 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,5 +1,5 @@
 Name:		ocp
-Version:	0.2.95
+Version:	0.2.96
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -13,7 +13,6 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Patch0:		ocp-0.2.95-ini-optimize.patch
 
-BuildRequires:	adplug-devel >= 2.3.1
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	cjson-devel
@@ -22,7 +21,6 @@ BuildRequires:	flac-devel
 BuildRequires:	freetype-devel
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
-BuildRequires:	libbinio-devel >= 1.5
 BuildRequires:	libdiscid-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
@@ -45,6 +43,8 @@ Requires:	unifont-fonts
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
 Provides:	bundled(libsidplayfp) = 2.3.1
+Provides:	bundled(adplug) = 2.3.3
+Provides:	bundled(libbinio) = 1.5
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
@@ -65,7 +65,6 @@ mv license.txt license-videos.txt
 
 %build
 %configure --without-x11 \
-	   --with-adplug \
 	   --with-alsa \
 	   --without-coreaudio \
 	   --without-oss \
@@ -80,11 +79,11 @@ mv license.txt license-videos.txt
 	   --with-unifontdir=/usr/share/fonts/unifont \
 	   --without-unifont-csur-ttf \
 	   --with-dumptools \
-	   --with-dir-suffix= \
 	   --docdir=%{_pkgdocdir} \
 #	   --with-debug
 # Makefiles are not SMP-clean
 %global _smp_mflags -j1
+ln -s . playopl/adplug-git/src/adplug
 %make_build
 
 
@@ -142,6 +141,11 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Mon May 02 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.96-1
+- update to 0.2.96
+- New bundled code: libbinio and adplug
+- Workaround for failure to find adplug/opl.h
+
 * Sat Mar 26 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.95-1
 - update to 0.2.95
 - disable X11, OSS, and SDL

From c2ea3d033a29454bc2976d215a4548049aa36e75 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Tue, 3 May 2022 12:05:37 -0400
Subject: [PATCH 18/59] new sources for 0.2.96

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f69f935..0013d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ opencp25image1.zip
 /opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
 /ocp-0.2.1.tar.bz2
 /ocp-0.2.95.tar.bz2
+/ocp-0.2.96.tar.bz2
diff --git a/sources b/sources
index 10f762a..3329e6d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.95.tar.bz2) = 696147defff6f8c6c5ba782c2a8b2f67a06234d6bd4e9d43ce55c3d372233fab988da7cbd9ce12b4d52663fa9cdc91f8abfd1206aae4a1295087544853c02a8b
+SHA512 (ocp-0.2.96.tar.bz2) = 2d784b9a1eb22412cde930f986f1b02c2c98ad3ec9c03146e3d8924928e56a3fc5f3a5319273ec14d9ab20d1333975828e7083f29eabb57b0552fbe97d5f283e
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 9209dd422a15f3ac21bc5caad884e6c6512ec401 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Tue, 3 May 2022 12:56:04 -0400
Subject: [PATCH 19/59] update to 0.2.97

---
 .gitignore |  1 +
 ocp.spec   | 11 +++++++----
 sources    |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0013d91..55392f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ opencp25image1.zip
 /ocp-0.2.1.tar.bz2
 /ocp-0.2.95.tar.bz2
 /ocp-0.2.96.tar.bz2
+/ocp-0.2.97.tar.bz2
diff --git a/ocp.spec b/ocp.spec
index 1886d9c..48b3821 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,5 +1,5 @@
 Name:		ocp
-Version:	0.2.96
+Version:	0.2.97
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -42,8 +42,8 @@ Requires:	unifont-fonts
 
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
-Provides:	bundled(libsidplayfp) = 2.3.1
-Provides:	bundled(adplug) = 2.3.3
+Provides:	bundled(libsidplayfp) = 2.4.0a
+Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
 
 %description
@@ -83,7 +83,6 @@ mv license.txt license-videos.txt
 #	   --with-debug
 # Makefiles are not SMP-clean
 %global _smp_mflags -j1
-ln -s . playopl/adplug-git/src/adplug
 %make_build
 
 
@@ -141,6 +140,10 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue May 03 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97-1
+- update to 0.2.97
+- Fixes failure to find adplug/opl.h
+
 * Mon May 02 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.96-1
 - update to 0.2.96
 - New bundled code: libbinio and adplug
diff --git a/sources b/sources
index 3329e6d..0f219da 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.96.tar.bz2) = 2d784b9a1eb22412cde930f986f1b02c2c98ad3ec9c03146e3d8924928e56a3fc5f3a5319273ec14d9ab20d1333975828e7083f29eabb57b0552fbe97d5f283e
+SHA512 (ocp-0.2.97.tar.bz2) = f9aa6999af7872e61cb4f734a79e287efc36b4949c4568b64061a2b082c5a26e1a6e2230f138d627dcf90a1e05fbefea901509a92dc5f0ee9f2646cb74bcc1ef
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From cbcdf9a2eb9d7126e788d40c88a2a409c76bfba7 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 1 Jun 2022 12:38:07 -0400
Subject: [PATCH 20/59] update to git snapshot

---
 ocp.spec | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 48b3821..1affc23 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,5 +1,11 @@
+%global snapshot 1
+%global commit 81214c8f4eeb89e1b047a738e84519b9dc262856
+%global gittag v0.2.97
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20220508
+
 Name:		ocp
-Version:	0.2.97
+Version:	0.2.97%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -8,7 +14,11 @@ Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 # Graphics and animations are CC-BY.
 License:	GPLv2+ and CC-BY
 URL:		https://stian.cubic.org/project-ocp.php
+%if 0%{?snapshot}
+Source0:        https://github.com/mywave82/opencubicplayer/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+%else
 Source0:	https://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
+%endif
 Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Patch0:		ocp-0.2.95-ini-optimize.patch
@@ -56,7 +66,11 @@ visualizations.
 
 
 %prep
-%autosetup
+%if 0%{?snapshot}
+%autosetup -p1 -n opencubicplayer-%{commit}
+%else
+%autosetup -p1
+%endif
 unzip %{SOURCE1}
 mv license.txt license-images.txt
 unzip %{SOURCE2}
@@ -140,6 +154,12 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Mon May 09 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97^20220508git81214c8-1
+- update to git snapshot
+
+* Fri May 06 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97-2
+- Patch Makefile to simplify sub-make usage and attempt to allow parallel build
+
 * Tue May 03 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97-1
 - update to 0.2.97
 - Fixes failure to find adplug/opl.h

From 82665ee4c94ac313d81aa0f83368d7f8598ac10d Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 1 Jun 2022 12:41:57 -0400
Subject: [PATCH 21/59] update sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 55392f9..7db7d58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ opencp25image1.zip
 /ocp-0.2.95.tar.bz2
 /ocp-0.2.96.tar.bz2
 /ocp-0.2.97.tar.bz2
+/ocp-81214c8.tar.gz
diff --git a/sources b/sources
index 0f219da..787e723 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.97.tar.bz2) = f9aa6999af7872e61cb4f734a79e287efc36b4949c4568b64061a2b082c5a26e1a6e2230f138d627dcf90a1e05fbefea901509a92dc5f0ee9f2646cb74bcc1ef
+SHA512 (ocp-81214c8.tar.gz) = 6a648fc96fec60dd755950ea432c44079630be895df825bb92fd5e0da33a6d6a8c9d8c7f53d8ded224aa1e83545d518dee55f2e6710deeafbbbe81384292c95f
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From a354eb8128f052a8379d0521de8edaf8fba11823 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 2 Jun 2022 18:58:42 -0400
Subject: [PATCH 22/59] update to 0.2.98

---
 .gitignore | 1 +
 ocp.spec   | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7db7d58..c542515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ opencp25image1.zip
 /ocp-0.2.96.tar.bz2
 /ocp-0.2.97.tar.bz2
 /ocp-81214c8.tar.gz
+/ocp-0.2.98.tar.bz2
diff --git a/ocp.spec b/ocp.spec
index 1affc23..f4840c5 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
-%global snapshot 1
+#global snapshot 1
 %global commit 81214c8f4eeb89e1b047a738e84519b9dc262856
-%global gittag v0.2.97
+%global gittag v0.2.98
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commitdate 20220508
 
 Name:		ocp
-Version:	0.2.97%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.98%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -154,6 +154,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Mon May 09 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98-1
+- update to 0.2.98
+
 * Mon May 09 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97^20220508git81214c8-1
 - update to git snapshot
 
diff --git a/sources b/sources
index 787e723..d83198f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-81214c8.tar.gz) = 6a648fc96fec60dd755950ea432c44079630be895df825bb92fd5e0da33a6d6a8c9d8c7f53d8ded224aa1e83545d518dee55f2e6710deeafbbbe81384292c95f
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
+SHA512 (ocp-0.2.98.tar.bz2) = ef6241a0e4854a1ae461a524366b999cbeb94ba1caccf9da2af020dce91abc22b84227f9ee0b23d3eacebaefca891ab84646f5a3429525d321993e1adc645926

From 29d170f076861b924d3ae7b74d891f1245196b9a Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 4 Jun 2022 03:05:51 -0400
Subject: [PATCH 23/59] Reenable X11 which will be used by default.

Run ocp-sdl2 to try the SDL2 version but there are various issues:
  https://github.com/mywave82/opencubicplayer/issues/60
---
 ocp.spec | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index f4840c5..462dad4 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.98%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -36,6 +36,10 @@ BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:	libX11-devel
+BuildRequires:	libXext-devel
+BuildRequires:	libXpm-devel
+BuildRequires:	libXxf86vm-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-interpreter
@@ -78,7 +82,7 @@ mv license.txt license-videos.txt
 
 
 %build
-%configure --without-x11 \
+%configure --with-x11 \
 	   --with-alsa \
 	   --without-coreaudio \
 	   --without-oss \
@@ -138,6 +142,7 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 %{_bindir}/ocp-curses
 %{_bindir}/ocp-sdl2
 %{_bindir}/ocp-vcsa
+%{_bindir}/ocp-x11
 %{_bindir}/dump*
 %{_infodir}/ocp.info*
 %{_mandir}/man1/ocp.1*
@@ -154,7 +159,12 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
-* Mon May 09 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98-1
+* Sat Jun 04 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98-2
+- Reenable X11 which will be used by default.
+- Run ocp-sdl2 to try the SDL2 version but there are various issues:
+  https://github.com/mywave82/opencubicplayer/issues/60
+
+* Thu Jun 02 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98-1
 - update to 0.2.98
 
 * Mon May 09 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.97^20220508git81214c8-1

From 14279e015278ccb11d65eab69b6fda9875c7531a Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 11 Jun 2022 01:12:38 -0400
Subject: [PATCH 24/59] add ocp-git-snapshot.sh shell script as Source3 to
 create git snapshot tarball add ocp-bundled-versions.sh shell script as
 Source4 to find bundled code versions document bundled reSID and libexsid
 versions update to git snapshot fixes several issues:   Parsing RIFF files
 could randomly crash (#58)   Delay FX command should use the last note given
 in the channel (#59)   Going from wurfel to text mode caused OCP to freeze
 (#61)   Does not close after typing Ctrl-C or clicking the window close box
 (#62, rhbz#2086433)

---
 .gitignore              |  1 +
 ocp-bundled-versions.sh | 17 +++++++++++++++++
 ocp-git-snapshot.sh     | 37 +++++++++++++++++++++++++++++++++++++
 ocp.spec                | 30 ++++++++++++++++++++++++------
 sources                 |  2 +-
 5 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100755 ocp-bundled-versions.sh
 create mode 100755 ocp-git-snapshot.sh

diff --git a/.gitignore b/.gitignore
index c542515..91bb31b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ opencp25image1.zip
 /ocp-0.2.97.tar.bz2
 /ocp-81214c8.tar.gz
 /ocp-0.2.98.tar.bz2
+/ocp-fbe858bc1f2f78a38af42301826c90eea4aa0efe.tar.bz2
diff --git a/ocp-bundled-versions.sh b/ocp-bundled-versions.sh
new file mode 100755
index 0000000..73c7c9e
--- /dev/null
+++ b/ocp-bundled-versions.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Try to find the versions of all the bundled source code projects by
+# searching for Autoconf AC_INIT macros.
+
+if [ x$1 = x ]; then
+    tree="."
+else
+    tree="$1"
+fi
+
+if [ ! -e ${tree}/configure.ac ]; then
+    echo "Missing ${tree}/configure.ac."
+    echo "Usage: $0 [path-to-root-of-ocp-source-tree]"
+    exit 1;
+fi
+
+grep -hEr 'AC_INIT\(|lib_major|lib_minor|lib_level' ${tree} | grep -Ev '#|='
diff --git a/ocp-git-snapshot.sh b/ocp-git-snapshot.sh
new file mode 100755
index 0000000..eab8b6a
--- /dev/null
+++ b/ocp-git-snapshot.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Since this project uses git submodules and Github's auto-archive
+# feature doesn't archive the submodules, you need to create a git
+# snapshot tarball manually with this ocp-git-snapshot.sh script.
+
+if [ -e ocp ]; then
+    echo "Not overwriting existing file: "
+    ls -ld ocp
+    exit 1
+fi
+
+set -x
+git clone --recurse-submodules --remote-submodules https://github.com/mywave82/opencubicplayer ocp
+# .gitmodules is missing branch = ocp in several submodules, so switch to that branch here
+git -C ocp/playopl/adplug-git checkout ocp
+git -C ocp/playsid/libsidplayfp-git/src/builders/resid-builder/resid checkout ocp
+head=`git -C ocp rev-parse HEAD`
+headdate=`git -C ocp log -1 --format=%cd --date='format:%Y%m%d'`
+set +x
+
+if [ -e ocp-${head} -o -e ocp-${head}.tar.bz2 ]; then
+    echo "Not overwriting existing files: "
+    ls -ld ocp-${head} ocp-${head}.tar.bz2
+    exit 1
+fi
+
+set -x
+mv ocp ocp-${head}
+tar cjf ocp-${head}.tar.bz2 --exclude='.git*' ocp-${head}
+rm -rf ocp-${head}
+set +x
+
+echo ""
+echo "Define these globals at the top of the spec file:"
+echo ""
+echo "%global commit ${head}"
+echo "%global commitdate ${headdate}"
diff --git a/ocp.spec b/ocp.spec
index 462dad4..cb14f68 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,12 @@
-#global snapshot 1
-%global commit 81214c8f4eeb89e1b047a738e84519b9dc262856
+%global snapshot 1
+%global commit fbe858bc1f2f78a38af42301826c90eea4aa0efe
+%global commitdate 20220610
 %global gittag v0.2.98
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20220508
 
 Name:		ocp
 Version:	0.2.98%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -15,12 +15,17 @@ Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 License:	GPLv2+ and CC-BY
 URL:		https://stian.cubic.org/project-ocp.php
 %if 0%{?snapshot}
-Source0:        https://github.com/mywave82/opencubicplayer/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+# Since this project uses git submodules and Github's auto-archive
+# feature doesn't archive the submodules, you need to create a git
+# snapshot tarball manually with ocp-git-snapshot.sh.
+Source0:	ocp-%{commit}.tar.bz2
 %else
 Source0:	https://stian.cubic.org/ocp/ocp-%{version}.tar.bz2
 %endif
 Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
+Source3:	ocp-git-snapshot.sh
+Source4:	ocp-bundled-versions.sh
 Patch0:		ocp-0.2.95-ini-optimize.patch
 
 BuildRequires:	alsa-lib-devel
@@ -59,6 +64,8 @@ Provides:	bundled(timidity++) = 2.15.0
 Provides:	bundled(libsidplayfp) = 2.4.0a
 Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
+Provides:	bundled(reSID) = 1.0-pre2
+Provides:	bundled(libexsid) = 2.1
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
@@ -71,7 +78,7 @@ visualizations.
 
 %prep
 %if 0%{?snapshot}
-%autosetup -p1 -n opencubicplayer-%{commit}
+%autosetup -p1 -n %{name}-%{commit}
 %else
 %autosetup -p1
 %endif
@@ -159,6 +166,17 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Fri Jun 10 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98^20220610gitfbe858b-1
+- add ocp-git-snapshot.sh shell script as Source3 to create git snapshot tarball
+- add ocp-bundled-versions.sh shell script as Source4 to find bundled code versions
+- document bundled reSID and libexsid versions
+- update to git snapshot
+- fixes several issues:
+  Parsing RIFF files could randomly crash (#58)
+  Delay FX command should use the last note given in the channel (#59)
+  Going from wurfel to text mode caused OCP to freeze (#61)
+  Does not close after typing Ctrl-C or clicking the window close box (#62, rhbz#2086433)
+
 * Sat Jun 04 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98-2
 - Reenable X11 which will be used by default.
 - Run ocp-sdl2 to try the SDL2 version but there are various issues:
diff --git a/sources b/sources
index d83198f..4ac2e9c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+SHA512 (ocp-fbe858bc1f2f78a38af42301826c90eea4aa0efe.tar.bz2) = bc7141f61b4680e9b3e52b7919328d53cd4cd4a2f822906a67b034e848fbf08c8dcb140cbc467e91acb5b2eb86ca92da4b1d170e56515188532b589140bd3c94
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
-SHA512 (ocp-0.2.98.tar.bz2) = ef6241a0e4854a1ae461a524366b999cbeb94ba1caccf9da2af020dce91abc22b84227f9ee0b23d3eacebaefca891ab84646f5a3429525d321993e1adc645926

From d34a8c65837c670326acf75db7d99313e08a3a48 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 11 Jun 2022 04:53:09 -0400
Subject: [PATCH 25/59] patch ocp.ini to set ROM paths for libsidplayfp
 (rhbz#2086434) remove obsolete patches from git

---
 ocp-0.2.1-no-gcc-version-check.patch | 72 ----------------------------
 ocp-0.2.1-no-i386-asm.patch          | 12 -----
 ocp-0.2.98-ini-rompaths.patch        | 16 +++++++
 ocp.spec                             |  6 ++-
 4 files changed, 21 insertions(+), 85 deletions(-)
 delete mode 100644 ocp-0.2.1-no-gcc-version-check.patch
 delete mode 100644 ocp-0.2.1-no-i386-asm.patch
 create mode 100644 ocp-0.2.98-ini-rompaths.patch

diff --git a/ocp-0.2.1-no-gcc-version-check.patch b/ocp-0.2.1-no-gcc-version-check.patch
deleted file mode 100644
index 8e3f480..0000000
--- a/ocp-0.2.1-no-gcc-version-check.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up ocp-0.2.1/configure.ac.no-gcc-version-check ocp-0.2.1/configure.ac
---- ocp-0.2.1/configure.ac.no-gcc-version-check	2020-02-08 19:05:13.993537420 -0500
-+++ ocp-0.2.1/configure.ac	2020-02-08 19:07:17.088275191 -0500
-@@ -123,31 +123,6 @@ dnl restore prefix and exec_prefix
-   exec_prefix=$exec_prefix_save
- ])
- 
--AC_MSG_CHECKING([gcc version])
--cc_version=`( $CC -dumpversion ) 2>&1`
--if test "$?" -gt 0 || test x$cc_version = x; then
--	AC_MSG_ERROR([not found])
--else
--	case $cc_version in
--		'')
--			AC_MSG_ERROR([not found]);
--			;;
--		2.95.[[2-9]]|2.95.[[2-9]][[-]].*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*|5.*|6.*|7*|8*|9*|10*)
--			_cc_major=`echo $cc_version | cut -d '.' -f 1`
--			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
--			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
--			if test $_cc_major -gt 2; then
--				AC_MSG_RESULT([$cc_version, ok])
--			else
--				AC_MSG_ERROR([$cc_version, bad])
--			fi
--			;;
--		*)
--			AC_MSG_ERROR([$cc_version, bad])
--			;;
--       esac
--fi
--
- AC_MSG_CHECKING([for broken signed char to signed int in loops (gcc version 4.1.1)])
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([
-diff -up ocp-0.2.1/configure.no-gcc-version-check ocp-0.2.1/configure
---- ocp-0.2.1/configure.no-gcc-version-check	2020-02-08 19:05:13.994537418 -0500
-+++ ocp-0.2.1/configure	2020-02-08 19:06:53.973324507 -0500
-@@ -6141,33 +6141,6 @@ test "x$exec_prefix" = xNONE && exec_pre
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
--$as_echo_n "checking gcc version... " >&6; }
--cc_version=`( $CC -dumpversion ) 2>&1`
--if test "$?" -gt 0 || test x$cc_version = x; then
--	as_fn_error $? "not found" "$LINENO" 5
--else
--	case $cc_version in
--		'')
--			as_fn_error $? "not found" "$LINENO" 5;
--			;;
--		2.95.[2-9]|2.95.[2-9][-].*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7*|8*|9*|10*)
--			_cc_major=`echo $cc_version | cut -d '.' -f 1`
--			_cc_minor=`echo $cc_version | cut -d '.' -f 2`
--			_cc_mini=`echo $cc_version | cut -d '.' -f 3`
--			if test $_cc_major -gt 2; then
--				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
--$as_echo "$cc_version, ok" >&6; }
--			else
--				as_fn_error $? "$cc_version, bad" "$LINENO" 5
--			fi
--			;;
--		*)
--			as_fn_error $? "$cc_version, bad" "$LINENO" 5
--			;;
--       esac
--fi
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken signed char to signed int in loops (gcc version 4.1.1)" >&5
- $as_echo_n "checking for broken signed char to signed int in loops (gcc version 4.1.1)... " >&6; }
- if test "$cross_compiling" = yes; then :
diff --git a/ocp-0.2.1-no-i386-asm.patch b/ocp-0.2.1-no-i386-asm.patch
deleted file mode 100644
index c56983b..0000000
--- a/ocp-0.2.1-no-i386-asm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in
---- opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in.noi386asm	2020-02-08 18:53:55.627986645 -0500
-+++ opencubicplayer-47ee5f8669c9bf88b64852f3ab50d9a244c3932f/config.h.in	2020-02-08 18:55:42.158758052 -0500
-@@ -161,7 +161,7 @@
- #undef HAVE_RESIZE_TERM
- 
- #if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__)
--#define I386_ASM 1
-+/* #define I386_ASM */
- #endif
- 
- /* #define I386_ASM_EMU 1 */
diff --git a/ocp-0.2.98-ini-rompaths.patch b/ocp-0.2.98-ini-rompaths.patch
new file mode 100644
index 0000000..ee0bc48
--- /dev/null
+++ b/ocp-0.2.98-ini-rompaths.patch
@@ -0,0 +1,16 @@
+diff -up ocp-0.2.98/ocp.ini.in.rompaths ocp-0.2.98/ocp.ini.in
+--- ocp-0.2.98/ocp.ini.in.rompaths	2022-05-31 19:33:41.000000000 -0400
++++ ocp-0.2.98/ocp.ini.in	2022-06-11 02:32:27.305151111 -0400
+@@ -143,9 +143,9 @@
+ ; kernal=~/roms/KERNAL.ROM
+ ; basic=../BASIC.ROM
+ ; chargen=/var/lib/roms/chargen.ROM
+-  kernal=KERNAL.ROM
+-  basic=BASIC.ROM
+-  chargen=CHARGEN.ROM
++  kernal=/usr/share/vice/C64/kernal
++  basic=/usr/share/vice/C64/basic
++  chargen=/usr/share/vice/C64/chargen
+ 
+ [devpALSA]
+   link=devpalsa
diff --git a/ocp.spec b/ocp.spec
index cb14f68..debc745 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.98%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -27,6 +27,7 @@ Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
 Patch0:		ocp-0.2.95-ini-optimize.patch
+Patch1:		ocp-0.2.98-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
@@ -166,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Sat Jun 11 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98^20220610gitfbe858b-2
+- patch ocp.ini to set ROM paths for libsidplayfp (rhbz#2086434)
+
 * Fri Jun 10 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98^20220610gitfbe858b-1
 - add ocp-git-snapshot.sh shell script as Source3 to create git snapshot tarball
 - add ocp-bundled-versions.sh shell script as Source4 to find bundled code versions

From 37b1cbcc4d2c9599053d32b4cb125a671478f032 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Mon, 13 Jun 2022 21:36:13 -0400
Subject: [PATCH 26/59] update to 0.2.99

simplify ocp-git-shapshot.sh to automatically checkout the correct
  submodule branches

cleanup .gitignore
---
 .gitignore          | 20 ++++++--------------
 ocp-git-snapshot.sh |  5 +----
 ocp.spec            | 17 +++++++++++------
 sources             |  2 +-
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91bb31b..53fc2f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,9 @@
+*~
+clog
 *.rpm
-ocp-snapshot-20100110.tar.bz2
-ocp-0.1.20.tar.bz2
-ocp-0.1.21.tar.bz2
+results_*/
+ocp-*.tar.gz
+ocp-*.tar.bz2
 opencp25ani1.zip
 opencp25image1.zip
-/ocp-0.1.22-20150223gitbceb98e.tar.bz2
-/ocp-0.1.22-20150224gita07bf5d.tar.bz2
-/opencubicplayer-code-e62ae525f16712fdbb9f655383071d0d683d3dc9.zip
-/opencubicplayer-code-849cc42c9446f68935269d6cc039dfd46e620f91.zip
-/ocp-0.2.1.tar.bz2
-/ocp-0.2.95.tar.bz2
-/ocp-0.2.96.tar.bz2
-/ocp-0.2.97.tar.bz2
-/ocp-81214c8.tar.gz
-/ocp-0.2.98.tar.bz2
-/ocp-fbe858bc1f2f78a38af42301826c90eea4aa0efe.tar.bz2
+ocp-*/
diff --git a/ocp-git-snapshot.sh b/ocp-git-snapshot.sh
index eab8b6a..4038c93 100755
--- a/ocp-git-snapshot.sh
+++ b/ocp-git-snapshot.sh
@@ -10,10 +10,7 @@ if [ -e ocp ]; then
 fi
 
 set -x
-git clone --recurse-submodules --remote-submodules https://github.com/mywave82/opencubicplayer ocp
-# .gitmodules is missing branch = ocp in several submodules, so switch to that branch here
-git -C ocp/playopl/adplug-git checkout ocp
-git -C ocp/playsid/libsidplayfp-git/src/builders/resid-builder/resid checkout ocp
+git clone --recurse-submodules https://github.com/mywave82/opencubicplayer ocp
 head=`git -C ocp rev-parse HEAD`
 headdate=`git -C ocp log -1 --format=%cd --date='format:%Y%m%d'`
 set +x
diff --git a/ocp.spec b/ocp.spec
index debc745..1d6b858 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,12 @@
-%global snapshot 1
-%global commit fbe858bc1f2f78a38af42301826c90eea4aa0efe
-%global commitdate 20220610
-%global gittag v0.2.98
+#global snapshot 1
+%global commit 47a2ba4563dcb07acb21e92073a43b63efc8ea2f
+%global commitdate 20220612
+%global gittag v0.2.99
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.98%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Version:	0.2.99%{?snapshot:^%{commitdate}git%{shortcommit}}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -167,6 +167,11 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Mon Jun 13 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.99-1
+- update to 0.2.99
+- simplify ocp-git-shapshot.sh to automatically checkout the correct
+  submodule branches
+
 * Sat Jun 11 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.98^20220610gitfbe858b-2
 - patch ocp.ini to set ROM paths for libsidplayfp (rhbz#2086434)
 
diff --git a/sources b/sources
index 4ac2e9c..e5a0be0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-fbe858bc1f2f78a38af42301826c90eea4aa0efe.tar.bz2) = bc7141f61b4680e9b3e52b7919328d53cd4cd4a2f822906a67b034e848fbf08c8dcb140cbc467e91acb5b2eb86ca92da4b1d170e56515188532b589140bd3c94
+SHA512 (ocp-0.2.99.tar.bz2) = 6d05db9b655031ccf83273ef302c514690948655c058cce491b08803a7e26ad84267b4e6ac09d5bd3d5f20b96599d3d67652ecd39a64fb7f6944a286999daf55
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 8a4af594a72eaa4c34e184a8b6a8eab2d1e399f9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 01:37:51 +0000
Subject: [PATCH 27/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 1d6b858..5486faa 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.99%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -167,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.99-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon Jun 13 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.99-1
 - update to 0.2.99
 - simplify ocp-git-shapshot.sh to automatically checkout the correct

From a46bd9ad2d2f41e4aec477000a7bd1d3c24f15c5 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Wed, 14 Sep 2022 09:05:06 -0500
Subject: [PATCH 28/59] Rebuilt for flac 1.4.0

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 5486faa..10bc8fe 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.99%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -167,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Wed Sep 14 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.2.99-3
+- Rebuilt for flac 1.4.0
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.99-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 2c76070388fe055dc5e9fd1df52046d16de96072 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Mon, 26 Sep 2022 05:01:31 -0400
Subject: [PATCH 29/59] update to 0.2.100

---
 ocp.spec | 11 +++++++----
 sources  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 1d6b858..c895d7b 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
-#global snapshot 1
+#global snapshot 0
 %global commit 47a2ba4563dcb07acb21e92073a43b63efc8ea2f
 %global commitdate 20220612
-%global gittag v0.2.99
+%global gittag v0.2.100
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.99%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.100%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -102,7 +102,7 @@ mv license.txt license-videos.txt
 	   --with-mad \
 	   --with-libiconv=auto \
 	   --with-timidity-default-path=/etc \
-	   --with-unifontdir=/usr/share/fonts/unifont \
+	   --with-unifontdir-ttf=/usr/share/fonts/unifont \
 	   --without-unifont-csur-ttf \
 	   --with-dumptools \
 	   --docdir=%{_pkgdocdir} \
@@ -167,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Sun Sep 25 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.100-1
+- update to 0.2.100
+
 * Mon Jun 13 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.99-1
 - update to 0.2.99
 - simplify ocp-git-shapshot.sh to automatically checkout the correct
diff --git a/sources b/sources
index e5a0be0..3403245 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.99.tar.bz2) = 6d05db9b655031ccf83273ef302c514690948655c058cce491b08803a7e26ad84267b4e6ac09d5bd3d5f20b96599d3d67652ecd39a64fb7f6944a286999daf55
+SHA512 (ocp-0.2.100.tar.bz2) = 7e126bd498e97b8e92243a16535405477a02389f2abeab9fdbbc0fee69aae7d7bc23db8175fd193dc38b948a41e14e562709b06e7418dedf3eee9d160dbe488c
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From b14fb156eac9532bf012d9fffc5395fae2e64dbe Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Fri, 23 Dec 2022 20:18:35 -0500
Subject: [PATCH 30/59] update to 0.2.101

---
 ocp.spec | 13 ++++++++-----
 sources  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 3fec268..c7a0fcc 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
 #global snapshot 0
-%global commit 47a2ba4563dcb07acb21e92073a43b63efc8ea2f
-%global commitdate 20220612
-%global gittag v0.2.100
+%global commit 30b272a5086730ab7f124302ec137ab1fb614e77
+%global commitdate 20221223
+%global gittag v0.2.101
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.100%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.101%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -62,7 +62,7 @@ Requires:	unifont-fonts
 
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
-Provides:	bundled(libsidplayfp) = 2.4.0a
+Provides:	bundled(libsidplayfp) = 2.5.0a
 Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
 Provides:	bundled(reSID) = 1.0-pre2
@@ -167,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Fri Dec 23 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.101-1
+- update to 0.2.101
+
 * Sun Sep 25 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.100-1
 - update to 0.2.100
 
diff --git a/sources b/sources
index 3403245..7ba1867 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.100.tar.bz2) = 7e126bd498e97b8e92243a16535405477a02389f2abeab9fdbbc0fee69aae7d7bc23db8175fd193dc38b948a41e14e562709b06e7418dedf3eee9d160dbe488c
+SHA512 (ocp-0.2.101.tar.bz2) = f9f50d1e1dfb262d7400275e78dfd11baaa67827213a80cd3c57486017f6a8290b18406cfbab348a94ab6347d346768be478565ec99d8529be98c79b6710ee6b
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 7066d45de4d5258d85ba776873b66861ecc1def0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 22:27:08 +0000
Subject: [PATCH 31/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index c7a0fcc..3dbbe14 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.101%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -167,6 +167,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Dec 23 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.101-1
 - update to 0.2.101
 

From aabebf815e4eec8f26f659701e3cb39c0c0ecaeb Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 12:28:45 -0500
Subject: [PATCH 32/59] add missing BR: ancient-libs-devel

---
 ocp.spec | 14 +++++++++-----
 sources  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index c7a0fcc..0ea5eea 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
 #global snapshot 0
-%global commit 30b272a5086730ab7f124302ec137ab1fb614e77
-%global commitdate 20221223
-%global gittag v0.2.101
+%global commit ce30a3e9ccbbadc939eb56ec2ec1c6a73c7fd5a5
+%global commitdate 20230123
+%global gittag v0.2.102
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.101%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.102%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -26,7 +26,7 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
-Patch0:		ocp-0.2.95-ini-optimize.patch
+Patch0:		ocp-0.2.102-ini-optimize.patch
 Patch1:		ocp-0.2.98-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel
@@ -37,6 +37,7 @@ BuildRequires:	flac-devel
 BuildRequires:	freetype-devel
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
+BuildRequires:	ancient-devel
 BuildRequires:	libdiscid-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
@@ -167,6 +168,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Mon Jan 23 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.102-1
+- update to 0.2.102
+
 * Fri Dec 23 2022 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.101-1
 - update to 0.2.101
 
diff --git a/sources b/sources
index 7ba1867..525cd61 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.101.tar.bz2) = f9f50d1e1dfb262d7400275e78dfd11baaa67827213a80cd3c57486017f6a8290b18406cfbab348a94ab6347d346768be478565ec99d8529be98c79b6710ee6b
+SHA512 (ocp-0.2.102.tar.bz2) = 6f3d7744e5889f97a0c11dcd4cd4957573acebde21f9a63d21ebb4c2873589a0dd3fdf0fd4f64720e624c5015de59cf1f1e50e39e9841a928fff266d15943006
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 3d9ca317bfa7de94619dcdf12b145624e21f7a32 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 12:48:44 -0500
Subject: [PATCH 33/59] add missing patch

---
 ...ni-optimize.patch => ocp-0.2.102-ini-optimize.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename ocp-0.2.95-ini-optimize.patch => ocp-0.2.102-ini-optimize.patch (54%)

diff --git a/ocp-0.2.95-ini-optimize.patch b/ocp-0.2.102-ini-optimize.patch
similarity index 54%
rename from ocp-0.2.95-ini-optimize.patch
rename to ocp-0.2.102-ini-optimize.patch
index 8b665db..ac85165 100644
--- a/ocp-0.2.95-ini-optimize.patch
+++ b/ocp-0.2.102-ini-optimize.patch
@@ -1,12 +1,12 @@
-diff -up ocp-0.2.95/ocp.ini.in.optimize ocp-0.2.95/ocp.ini.in
---- ocp-0.2.95/ocp.ini.in.optimize	2022-03-21 16:19:44.000000000 -0400
-+++ ocp-0.2.95/ocp.ini.in	2022-03-26 20:42:24.824581501 -0400
-@@ -22,7 +22,7 @@
+diff -up ocp-0.2.102/ocp.ini.in.playerdevices ocp-0.2.102/ocp.ini.in
+--- ocp-0.2.102/ocp.ini.in.playerdevices	2023-01-23 14:54:39.000000000 -0500
++++ ocp-0.2.102/ocp.ini.in	2023-01-23 16:02:34.158371176 -0500
+@@ -29,7 +29,7 @@
  ; (8 chars only)
  ; note: the first device found in each list will be uses as default
  
 -  playerdevices=devpALSA devpOSS devpCA devpSDL2 devpSDL devpNone devpDisk
 +  playerdevices=devpALSA devpSDL2 devpNone devpDisk
-   wavetabledevices=devwMixF devwmixQ devwMix devwNone
+   wavetabledevices=devwMixF devwMixQ devwMix devwNone
    mixrate=44100           ; -sr44100
    mixprocrate=4096000     ; max channels*rate (for slow cpus) (4096000==64*64000)

From e4a0be5e6b7a3c6b3eaf2ddcb8c4d6352a41b11f Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 13:39:32 -0500
Subject: [PATCH 34/59] unifont-fonts switched from .ttf to .otf, specify paths
 in configure

---
 ocp.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index c8c7b4d..8fb760e 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -103,8 +103,9 @@ mv license.txt license-videos.txt
 	   --with-mad \
 	   --with-libiconv=auto \
 	   --with-timidity-default-path=/etc \
-	   --with-unifontdir-ttf=/usr/share/fonts/unifont \
-	   --without-unifont-csur-ttf \
+	   --with-unifont-otf=/usr/share/fonts/unifont/unifont.otf \
+	   --with-unifont-csur-otf=/usr/share/fonts/unifont/unifont_csur.otf \
+	   --with-unifont-upper-otf=/usr/share/fonts/unifont/unifont_upper.otf \
 	   --with-dumptools \
 	   --docdir=%{_pkgdocdir} \
 #	   --with-debug
@@ -168,6 +169,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Wed Mar 08 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.102-2
+- unifont-fonts switched from .ttf to .otf, specify paths in configure
+
 * Mon Jan 23 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.102-1
 - update to 0.2.102
 

From 62f2370007756e5622c3285f7a20f30a594b7a3d Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 14:29:30 -0500
Subject: [PATCH 35/59] update to 0.2.103

---
 ocp.spec | 19 +++++++++++--------
 sources  |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 8fb760e..9e3db9f 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
 #global snapshot 0
-%global commit ce30a3e9ccbbadc939eb56ec2ec1c6a73c7fd5a5
-%global commitdate 20230123
-%global gittag v0.2.102
+%global commit 2e88e84eea52c409cfcb746562302d8668967820
+%global commitdate 20230218
+%global gittag v0.2.103
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.102%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.103%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -128,9 +128,7 @@ rm -f %{buildroot}/%{_infodir}/dir
 # rename desktop file to name.desktop to match packaging guidelines
 mv %{buildroot}%{_datadir}/applications/*opencubicplayer.desktop \
    %{buildroot}%{_datadir}/applications/ocp.desktop
-desktop-file-install --add-category="Audio" \
-		     --add-category="Midi" \
-		     --add-category="Player" \
+desktop-file-install --add-category="Midi" \
 		     --dir=%{buildroot}%{_datadir}/applications \
 		     --delete-original \
 		     %{buildroot}%{_datadir}/applications/ocp.desktop
@@ -165,15 +163,20 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 %{_datadir}/icons/hicolor/128x128/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/applications/*ocp.desktop
+%{_datadir}/mime/packages/opencubicplayer.xml
 %config(noreplace) /etc/ocp.ini
 
 
 %changelog
-* Wed Mar 08 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.102-2
+* Wed Mar 08 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.103-1
+- update to 0.2.103
+
+* Wed Mar 08 2023 Charles R. Anderson <cra@alum.wpi.edu>
 - unifont-fonts switched from .ttf to .otf, specify paths in configure
 
 * Mon Jan 23 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.102-1
 - update to 0.2.102
+- add BR: ancient-devel
 
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.101-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 525cd61..4aefa1f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.102.tar.bz2) = 6f3d7744e5889f97a0c11dcd4cd4957573acebde21f9a63d21ebb4c2873589a0dd3fdf0fd4f64720e624c5015de59cf1f1e50e39e9841a928fff266d15943006
+SHA512 (ocp-0.2.103.tar.bz2) = a0d596d3988de7928da226b9f1eeb028bbd1be66a6fd33feb23b9e44807428a4e1377cb520cb836ce0972bcba6f580385ccf57377890667bde565d853febd6bc
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 54a831b57be4988360890450617512ac4735b0db Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 15:02:44 -0500
Subject: [PATCH 36/59] update ocp-0.2.103-ini-optimize.patch

---
 ...ni-optimize.patch => ocp-0.2.103-ini-optimize.patch | 10 +++++-----
 ocp.spec                                               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ocp-0.2.102-ini-optimize.patch => ocp-0.2.103-ini-optimize.patch (59%)

diff --git a/ocp-0.2.102-ini-optimize.patch b/ocp-0.2.103-ini-optimize.patch
similarity index 59%
rename from ocp-0.2.102-ini-optimize.patch
rename to ocp-0.2.103-ini-optimize.patch
index ac85165..f23879d 100644
--- a/ocp-0.2.102-ini-optimize.patch
+++ b/ocp-0.2.103-ini-optimize.patch
@@ -1,10 +1,10 @@
-diff -up ocp-0.2.102/ocp.ini.in.playerdevices ocp-0.2.102/ocp.ini.in
---- ocp-0.2.102/ocp.ini.in.playerdevices	2023-01-23 14:54:39.000000000 -0500
-+++ ocp-0.2.102/ocp.ini.in	2023-01-23 16:02:34.158371176 -0500
-@@ -29,7 +29,7 @@
+diff -up ocp-0.2.103/ocp.ini.in.playerdevices ocp-0.2.103/ocp.ini.in
+--- ocp-0.2.103/ocp.ini.in.playerdevices	2023-02-18 06:23:10.000000000 -0500
++++ ocp-0.2.103/ocp.ini.in	2023-03-08 15:01:00.342869054 -0500
+@@ -27,7 +27,7 @@
+ ; you can also add new devices by copying the section and renaming it.
  ; (8 chars only)
  ; note: the first device found in each list will be uses as default
- 
 -  playerdevices=devpALSA devpOSS devpCA devpSDL2 devpSDL devpNone devpDisk
 +  playerdevices=devpALSA devpSDL2 devpNone devpDisk
    wavetabledevices=devwMixF devwMixQ devwMix devwNone
diff --git a/ocp.spec b/ocp.spec
index 9e3db9f..1c04eb3 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -26,7 +26,7 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
-Patch0:		ocp-0.2.102-ini-optimize.patch
+Patch0:		ocp-0.2.103-ini-optimize.patch
 Patch1:		ocp-0.2.98-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel

From 9574251467e08533477748f1d605360baa72f956 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 15:10:58 -0500
Subject: [PATCH 37/59] update ocp-0.2.103-ini-rompaths.patch

---
 ...ni-rompaths.patch => ocp-0.2.103-ini-rompaths.patch | 10 +++++-----
 ocp.spec                                               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ocp-0.2.98-ini-rompaths.patch => ocp-0.2.103-ini-rompaths.patch (53%)

diff --git a/ocp-0.2.98-ini-rompaths.patch b/ocp-0.2.103-ini-rompaths.patch
similarity index 53%
rename from ocp-0.2.98-ini-rompaths.patch
rename to ocp-0.2.103-ini-rompaths.patch
index ee0bc48..f00ebb4 100644
--- a/ocp-0.2.98-ini-rompaths.patch
+++ b/ocp-0.2.103-ini-rompaths.patch
@@ -1,7 +1,7 @@
-diff -up ocp-0.2.98/ocp.ini.in.rompaths ocp-0.2.98/ocp.ini.in
---- ocp-0.2.98/ocp.ini.in.rompaths	2022-05-31 19:33:41.000000000 -0400
-+++ ocp-0.2.98/ocp.ini.in	2022-06-11 02:32:27.305151111 -0400
-@@ -143,9 +143,9 @@
+diff -up ocp-0.2.103/ocp.ini.in.rompaths ocp-0.2.103/ocp.ini.in
+--- ocp-0.2.103/ocp.ini.in.rompaths	2023-03-08 15:01:00.342869054 -0500
++++ ocp-0.2.103/ocp.ini.in	2023-03-08 15:09:58.923064939 -0500
+@@ -135,9 +135,9 @@
  ; kernal=~/roms/KERNAL.ROM
  ; basic=../BASIC.ROM
  ; chargen=/var/lib/roms/chargen.ROM
@@ -13,4 +13,4 @@ diff -up ocp-0.2.98/ocp.ini.in.rompaths ocp-0.2.98/ocp.ini.in
 +  chargen=/usr/share/vice/C64/chargen
  
  [devpALSA]
-   link=devpalsa
+   card=default
diff --git a/ocp.spec b/ocp.spec
index 1c04eb3..61f9dc6 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -27,7 +27,7 @@ Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
 Patch0:		ocp-0.2.103-ini-optimize.patch
-Patch1:		ocp-0.2.98-ini-rompaths.patch
+Patch1:		ocp-0.2.103-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel

From 4abde4729031087b76c31aea38db22bf5e2a1d2e Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 15:18:41 -0500
Subject: [PATCH 38/59] BR: shared-mime-database for
 /usr/bin/update-mime-database

---
 ocp.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ocp.spec b/ocp.spec
index 61f9dc6..01ac4e0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -50,6 +50,7 @@ BuildRequires:	libXxf86vm-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-interpreter
+BuildRequires:	shared-mime-info
 BuildRequires:	SDL2-devel
 BuildRequires:	texinfo
 BuildRequires:	unifont-fonts

From 5f28bc28ddd18a6ca454e25f3a00b1b632377edb Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Mar 2023 15:49:41 -0500
Subject: [PATCH 39/59] add
 --without-update-mime-database/--without-update-desktop-database

---
 ocp.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 01ac4e0..db89ea2 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -50,7 +50,6 @@ BuildRequires:	libXxf86vm-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-interpreter
-BuildRequires:	shared-mime-info
 BuildRequires:	SDL2-devel
 BuildRequires:	texinfo
 BuildRequires:	unifont-fonts
@@ -108,6 +107,8 @@ mv license.txt license-videos.txt
 	   --with-unifont-csur-otf=/usr/share/fonts/unifont/unifont_csur.otf \
 	   --with-unifont-upper-otf=/usr/share/fonts/unifont/unifont_upper.otf \
 	   --with-dumptools \
+	   --without-update-mime-database \
+	   --without-update-desktop-database \
 	   --docdir=%{_pkgdocdir} \
 #	   --with-debug
 # Makefiles are not SMP-clean

From 04fc63071bfe7824e936d7448eff1abfe161c66b Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Tue, 14 Mar 2023 21:39:22 -0400
Subject: [PATCH 40/59] Make .otf conditional on f39+

---
 ocp.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index db89ea2..353b955 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.103%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -103,9 +103,14 @@ mv license.txt license-videos.txt
 	   --with-mad \
 	   --with-libiconv=auto \
 	   --with-timidity-default-path=/etc \
+%if 0%{?fedora} < 39
+	   --with-unifontdir-ttf=/usr/share/fonts/unifont \
+	   --without-unifont-csur-ttf \
+%else
 	   --with-unifont-otf=/usr/share/fonts/unifont/unifont.otf \
 	   --with-unifont-csur-otf=/usr/share/fonts/unifont/unifont_csur.otf \
 	   --with-unifont-upper-otf=/usr/share/fonts/unifont/unifont_upper.otf \
+%endif
 	   --with-dumptools \
 	   --without-update-mime-database \
 	   --without-update-desktop-database \
@@ -170,6 +175,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue Mar 14 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.103-2
+- Make .otf conditional on f39+
+
 * Wed Mar 08 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.103-1
 - update to 0.2.103
 

From 6f0ca4ed901a708034551fd2d1c69418a4c4be00 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 18 May 2023 19:33:23 -0400
Subject: [PATCH 41/59] update to 0.2.105

---
 ocp-0.2.103-ini-rompaths.patch | 16 ----------------
 ocp-0.2.105-ini-rompaths.patch | 16 ++++++++++++++++
 ocp.spec                       | 11 +++++++----
 sources                        |  2 +-
 4 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 ocp-0.2.103-ini-rompaths.patch
 create mode 100644 ocp-0.2.105-ini-rompaths.patch

diff --git a/ocp-0.2.103-ini-rompaths.patch b/ocp-0.2.103-ini-rompaths.patch
deleted file mode 100644
index f00ebb4..0000000
--- a/ocp-0.2.103-ini-rompaths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up ocp-0.2.103/ocp.ini.in.rompaths ocp-0.2.103/ocp.ini.in
---- ocp-0.2.103/ocp.ini.in.rompaths	2023-03-08 15:01:00.342869054 -0500
-+++ ocp-0.2.103/ocp.ini.in	2023-03-08 15:09:58.923064939 -0500
-@@ -135,9 +135,9 @@
- ; kernal=~/roms/KERNAL.ROM
- ; basic=../BASIC.ROM
- ; chargen=/var/lib/roms/chargen.ROM
--  kernal=KERNAL.ROM
--  basic=BASIC.ROM
--  chargen=CHARGEN.ROM
-+  kernal=/usr/share/vice/C64/kernal
-+  basic=/usr/share/vice/C64/basic
-+  chargen=/usr/share/vice/C64/chargen
- 
- [devpALSA]
-   card=default
diff --git a/ocp-0.2.105-ini-rompaths.patch b/ocp-0.2.105-ini-rompaths.patch
new file mode 100644
index 0000000..c867229
--- /dev/null
+++ b/ocp-0.2.105-ini-rompaths.patch
@@ -0,0 +1,16 @@
+diff -up ocp-0.2.105/ocp.ini.in.rompaths ocp-0.2.105/ocp.ini.in
+--- ocp-0.2.105/ocp.ini.in.rompaths	2023-05-12 17:23:30.000000000 -0400
++++ ocp-0.2.105/ocp.ini.in	2023-05-18 19:27:33.371405420 -0400
+@@ -135,9 +135,9 @@
+ ; kernal=~/roms/KERNAL.ROM
+ ; basic=../BASIC.ROM
+ ; chargen=/var/lib/roms/chargen.ROM
+-  kernal=KERNAL.ROM
+-  basic=BASIC.ROM
+-  chargen=CHARGEN.ROM
++  kernal=/usr/share/vice/C64/kernal
++  basic=/usr/share/vice/C64/basic
++  chargen=/usr/share/vice/C64/chargen
+ 
+ [adplug]
+   emulator=nuked          ; Possible values are ken, nuked, satoh and woody.
diff --git a/ocp.spec b/ocp.spec
index 353b955..cdbc1b0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -5,8 +5,8 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.103%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Version:	0.2.105%{?snapshot:^%{commitdate}git%{shortcommit}}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -27,7 +27,7 @@ Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
 Patch0:		ocp-0.2.103-ini-optimize.patch
-Patch1:		ocp-0.2.103-ini-rompaths.patch
+Patch1:		ocp-0.2.105-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
@@ -63,7 +63,7 @@ Requires:	unifont-fonts
 
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
-Provides:	bundled(libsidplayfp) = 2.5.0a
+Provides:	bundled(libsidplayfp) = 2.5.0a2
 Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
 Provides:	bundled(reSID) = 1.0-pre2
@@ -175,6 +175,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu May 18 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.105-1
+- update to 0.2.105
+
 * Tue Mar 14 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.103-2
 - Make .otf conditional on f39+
 
diff --git a/sources b/sources
index 4aefa1f..1629765 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.103.tar.bz2) = a0d596d3988de7928da226b9f1eeb028bbd1be66a6fd33feb23b9e44807428a4e1377cb520cb836ce0972bcba6f580385ccf57377890667bde565d853febd6bc
+SHA512 (ocp-0.2.105.tar.bz2) = 073eefda2d439871a79e5e9982fa59b46968d36cef06636194c7b2d6e845d3879b36e5cc963a27067285cc2005031fc85bc3f818fe577cd816480f014d0b081e
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From b0d18e80fe81dd7fe07c9d69aa50721af1b5a415 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 18 May 2023 21:02:45 -0400
Subject: [PATCH 42/59] Adjust .otf conditional to f38+

---
 ocp.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index cdbc1b0..de9aefe 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.105%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -103,7 +103,7 @@ mv license.txt license-videos.txt
 	   --with-mad \
 	   --with-libiconv=auto \
 	   --with-timidity-default-path=/etc \
-%if 0%{?fedora} < 39
+%if 0%{?fedora} < 38
 	   --with-unifontdir-ttf=/usr/share/fonts/unifont \
 	   --without-unifont-csur-ttf \
 %else
@@ -175,6 +175,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu May 18 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.105-2
+- Adjust .otf conditional to f38+
+
 * Thu May 18 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.105-1
 - update to 0.2.105
 

From edcc39a122b71d2e25e9fa9cf51553b90b6a695a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 17:39:04 +0000
Subject: [PATCH 43/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index de9aefe..ad289b0 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.105%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -175,6 +175,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.105-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu May 18 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.105-2
 - Adjust .otf conditional to f38+
 

From 58c50a0b6abbc3792c2f3315e8e077dc19fe84d1 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 5 Aug 2023 18:14:35 -0400
Subject: [PATCH 44/59] Update to 0.2.106 which adds game-music-emu libgme
 support

---
 ...ze.patch => ocp-0.2.106-ini-optimize.patch |  6 +++---
 ...hs.patch => ocp-0.2.106-ini-rompaths.patch |  8 ++++----
 ocp.spec                                      | 19 ++++++++++++-------
 sources                                       |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)
 rename ocp-0.2.103-ini-optimize.patch => ocp-0.2.106-ini-optimize.patch (69%)
 rename ocp-0.2.105-ini-rompaths.patch => ocp-0.2.106-ini-rompaths.patch (62%)

diff --git a/ocp-0.2.103-ini-optimize.patch b/ocp-0.2.106-ini-optimize.patch
similarity index 69%
rename from ocp-0.2.103-ini-optimize.patch
rename to ocp-0.2.106-ini-optimize.patch
index f23879d..5e2f35a 100644
--- a/ocp-0.2.103-ini-optimize.patch
+++ b/ocp-0.2.106-ini-optimize.patch
@@ -1,6 +1,6 @@
-diff -up ocp-0.2.103/ocp.ini.in.playerdevices ocp-0.2.103/ocp.ini.in
---- ocp-0.2.103/ocp.ini.in.playerdevices	2023-02-18 06:23:10.000000000 -0500
-+++ ocp-0.2.103/ocp.ini.in	2023-03-08 15:01:00.342869054 -0500
+diff -up ocp-0.2.106/ocp.ini.in.optimize ocp-0.2.106/ocp.ini.in
+--- ocp-0.2.106/ocp.ini.in.optimize	2023-07-30 18:13:45.000000000 -0400
++++ ocp-0.2.106/ocp.ini.in	2023-08-05 09:11:31.042860041 -0400
 @@ -27,7 +27,7 @@
  ; you can also add new devices by copying the section and renaming it.
  ; (8 chars only)
diff --git a/ocp-0.2.105-ini-rompaths.patch b/ocp-0.2.106-ini-rompaths.patch
similarity index 62%
rename from ocp-0.2.105-ini-rompaths.patch
rename to ocp-0.2.106-ini-rompaths.patch
index c867229..8aa0c8a 100644
--- a/ocp-0.2.105-ini-rompaths.patch
+++ b/ocp-0.2.106-ini-rompaths.patch
@@ -1,6 +1,6 @@
-diff -up ocp-0.2.105/ocp.ini.in.rompaths ocp-0.2.105/ocp.ini.in
---- ocp-0.2.105/ocp.ini.in.rompaths	2023-05-12 17:23:30.000000000 -0400
-+++ ocp-0.2.105/ocp.ini.in	2023-05-18 19:27:33.371405420 -0400
+diff -up ocp-0.2.106/ocp.ini.in.rompaths ocp-0.2.106/ocp.ini.in
+--- ocp-0.2.106/ocp.ini.in.rompaths	2023-07-30 18:13:45.000000000 -0400
++++ ocp-0.2.106/ocp.ini.in	2023-08-05 09:09:18.608319915 -0400
 @@ -135,9 +135,9 @@
  ; kernal=~/roms/KERNAL.ROM
  ; basic=../BASIC.ROM
@@ -13,4 +13,4 @@ diff -up ocp-0.2.105/ocp.ini.in.rompaths ocp-0.2.105/ocp.ini.in
 +  chargen=/usr/share/vice/C64/chargen
  
  [adplug]
-   emulator=nuked          ; Possible values are ken, nuked, satoh and woody.
+   emulator=nuked          ; Possible values are ken, nuked, satoh woody and retrowave.
diff --git a/ocp.spec b/ocp.spec
index ad289b0..5ed9f44 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,12 @@
 #global snapshot 0
-%global commit 2e88e84eea52c409cfcb746562302d8668967820
-%global commitdate 20230218
-%global gittag v0.2.103
+%global commit 6fc7e5c538d4f0bc41df7450e9daeb49b8b97d70
+%global commitdate 20230612
+%global gittag v0.2.106
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.105%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	3%{?dist}
+Version:	0.2.106%{?snapshot:^%{commitdate}git%{shortcommit}}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -26,8 +26,8 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
-Patch0:		ocp-0.2.103-ini-optimize.patch
-Patch1:		ocp-0.2.105-ini-rompaths.patch
+Patch0:		ocp-0.2.106-ini-optimize.patch
+Patch1:		ocp-0.2.106-ini-rompaths.patch
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
@@ -35,6 +35,7 @@ BuildRequires:	cjson-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	flac-devel
 BuildRequires:	freetype-devel
+BuildRequires:	game-music-emu-devel
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	ancient-devel
@@ -97,6 +98,7 @@ mv license.txt license-videos.txt
 	   --without-oss \
 	   --with-lzw \
 	   --with-lzh \
+	   --with-libgme \
 	   --with-flac \
 	   --without-sdl \
 	   --with-sdl2 \
@@ -175,6 +177,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Sat Aug 05 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.106-1
+- Update to 0.2.106 which adds game-music-emu libgme support
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.105-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 1629765..ad83e86 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.105.tar.bz2) = 073eefda2d439871a79e5e9982fa59b46968d36cef06636194c7b2d6e845d3879b36e5cc963a27067285cc2005031fc85bc3f818fe577cd816480f014d0b081e
+SHA512 (ocp-0.2.106.tar.bz2) = 8dd158e76b4440a139f0a0358e01d7d793d95ffd519caf39239b56359a8dc145bc4e46d28bdafc3a6a5ff0ad6d2dfd44852d250ac609ac581dfa8292c70962e4
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 7ee09f63382609c3fad3f128d63fe813c44e0d2b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 10:37:37 +0000
Subject: [PATCH 45/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 5ed9f44..df5702b 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.106%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.106-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Aug 05 2023 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.106-1
 - Update to 0.2.106 which adds game-music-emu libgme support
 

From 72745dfa4ca43ed5b460b875a13e208760b5f224 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 10:39:56 +0000
Subject: [PATCH 46/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index df5702b..8d36bcc 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.106%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -177,6 +177,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.106-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.106-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 943215a0142ecadc04c120d91e0d4d679026953d Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 21 Feb 2024 00:36:17 -0500
Subject: [PATCH 47/59] update to 0.2.107

---
 ocp.spec | 15 +++++++++------
 sources  |  4 +---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 8d36bcc..97c90ff 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,12 @@
 #global snapshot 0
-%global commit 6fc7e5c538d4f0bc41df7450e9daeb49b8b97d70
-%global commitdate 20230612
-%global gittag v0.2.106
+%global commit 2485703e7919bafb92e3327f27908c4f34af7cae
+%global commitdate 20240219
+%global gittag v0.2.107
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.106%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	3%{?dist}
+Version:	0.2.107%{?snapshot:^%{commitdate}git%{shortcommit}}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
@@ -64,7 +64,7 @@ Requires:	unifont-fonts
 
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
-Provides:	bundled(libsidplayfp) = 2.5.0a2
+Provides:	bundled(libsidplayfp) = 2.7.0b
 Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
 Provides:	bundled(reSID) = 1.0-pre2
@@ -177,6 +177,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue Feb 20 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.107-1
+- Update to 0.2.107
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.106-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index ad83e86..a5d47a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (ocp-0.2.106.tar.bz2) = 8dd158e76b4440a139f0a0358e01d7d793d95ffd519caf39239b56359a8dc145bc4e46d28bdafc3a6a5ff0ad6d2dfd44852d250ac609ac581dfa8292c70962e4
-SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
-SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
+SHA512 (ocp-0.2.107.tar.bz2) = f0bfe090bf6db6e9e64a4ea04c2403da63fd9565b1068c8292b2bfec7d96c9af55be3d139c2ba2d4675509626d0e0206cc0393ce9bbc343ea917dc70c236ee49

From 75b858fc045449c07378241b00d0002cac3f1408 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 21 Feb 2024 01:08:54 -0500
Subject: [PATCH 48/59] re-add zip files to sources

---
 sources | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sources b/sources
index a5d47a9..df10268 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
+SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
 SHA512 (ocp-0.2.107.tar.bz2) = f0bfe090bf6db6e9e64a4ea04c2403da63fd9565b1068c8292b2bfec7d96c9af55be3d139c2ba2d4675509626d0e0206cc0393ce9bbc343ea917dc70c236ee49

From 9a1a0bd958e8f88a0371a12562fe7b4eaba17ce6 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 4 Apr 2024 12:32:07 -0400
Subject: [PATCH 49/59] Update to 0.2.108 + snapshot that fixes a crasher bug

---
 ocp.spec | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 97c90ff..d4e0efd 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
-#global snapshot 0
-%global commit 2485703e7919bafb92e3327f27908c4f34af7cae
-%global commitdate 20240219
-%global gittag v0.2.107
+%global snapshot 1
+%global commit d1fc8df0a9b800ef8d2fdd08f8f2c4d5d1234829
+%global commitdate 20240402
+#global gittag v0.2.108
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.107%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.108%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -177,6 +177,12 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Apr 04 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.108^20240404gitd1fc8df-1
+- Update to snapshot that fixes a crasher bug
+
+* Thu Apr 04 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.108-1
+- Update to 0.2.108
+
 * Tue Feb 20 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.107-1
 - Update to 0.2.107
 

From f3097ff4584790e0343e7a3deba425534dc797c6 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 4 Apr 2024 12:34:13 -0400
Subject: [PATCH 50/59] add new sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index df10268..c1f2154 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+SHA512 (ocp-d1fc8df0a9b800ef8d2fdd08f8f2c4d5d1234829.tar.bz2) = e7af3db252116950eba06570dec492bda404a2ebe4ef5232d2cc96a7cfacd29502bd0955dd304d17ad87ecbb1dd882e8199b29ea9fff5b2abc50cbecfbe32d36
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
-SHA512 (ocp-0.2.107.tar.bz2) = f0bfe090bf6db6e9e64a4ea04c2403da63fd9565b1068c8292b2bfec7d96c9af55be3d139c2ba2d4675509626d0e0206cc0393ce9bbc343ea917dc70c236ee49

From b1b364d25b5409fb505f95cffb4bd2df4da7b55d Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Sat, 6 Apr 2024 08:08:49 -0400
Subject: [PATCH 51/59] Update to 0.2.109

---
 ocp.spec | 13 ++++++++-----
 sources  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index d4e0efd..393eae6 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
-%global snapshot 1
-%global commit d1fc8df0a9b800ef8d2fdd08f8f2c4d5d1234829
-%global commitdate 20240402
-#global gittag v0.2.108
+#global snapshot 0
+%global commit d2da9c4dc12d634e5b9653bb1f4bdc10d4f77e10
+%global commitdate 20240404
+%global gittag v0.2.109
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.108%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	0.2.109%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -177,6 +177,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Fri Apr 05 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.109-1
+- Update to 0.2.109
+
 * Thu Apr 04 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.108^20240404gitd1fc8df-1
 - Update to snapshot that fixes a crasher bug
 
diff --git a/sources b/sources
index c1f2154..095e5a6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-d1fc8df0a9b800ef8d2fdd08f8f2c4d5d1234829.tar.bz2) = e7af3db252116950eba06570dec492bda404a2ebe4ef5232d2cc96a7cfacd29502bd0955dd304d17ad87ecbb1dd882e8199b29ea9fff5b2abc50cbecfbe32d36
+SHA512 (ocp-0.2.109.tar.bz2) = 37e0121bb5fd80499334a23e7fc473240830df788a3f8d5846a894dc4977f7d99a57ee2218b32705cf98f0310246076b50d2ba2ac1b989e4e030ee7da7675108
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From c93ed6a95a523854d280d354832e2bc54e238d58 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Thu, 18 Apr 2024 23:41:17 -0400
Subject: [PATCH 52/59] Convert License tag to SPDX format and add missing
 licenses

---
 ocp.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 393eae6..eba7c30 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,13 +6,12 @@
 
 Name:		ocp
 Version:	0.2.109%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
-# 2010/08/08: Verified that upstream has removed GPLv3+ gnulib and added
-# GPLv2+ license text to all source files.
-# Graphics and animations are CC-BY.
-License:	GPLv2+ and CC-BY
+# Main ocp source is GPL-2.0-or-later.
+# Graphics and animations are CC-BY-3.0.
+License:	GPL-2.0-or-later AND CC-BY-3.0 AND GPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.1-or-later AND X11 AND BSD-2-Clause AND BSD-3-Clause AND Zlib
 URL:		https://stian.cubic.org/project-ocp.php
 %if 0%{?snapshot}
 # Since this project uses git submodules and Github's auto-archive
@@ -177,6 +176,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Apr 18 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.109-2
+- Convert License tag to SPDX format and add missing licenses
+
 * Fri Apr 05 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.109-1
 - Update to 0.2.109
 

From 32b7d6c69cfb4104ab48566840d96c3429760f7f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 20:28:23 +0000
Subject: [PATCH 53/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index eba7c30..8072f21 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	0.2.109%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # Main ocp source is GPL-2.0-or-later.
@@ -176,6 +176,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.109-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Apr 18 2024 Charles R. Anderson <cra@alum.wpi.edu> - 0.2.109-2
 - Convert License tag to SPDX format and add missing licenses
 

From 86b8463c992e48d7788d45d45850e30cf4323a1b Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Tue, 24 Dec 2024 06:35:53 -0500
Subject: [PATCH 54/59] Update to 3.0.0

Adds modland.com support directly from the file browser
Various bugfixes
---
 ocp.spec | 16 ++++++++++------
 sources  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index 8072f21..ba009bf 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,12 +1,12 @@
 #global snapshot 0
-%global commit d2da9c4dc12d634e5b9653bb1f4bdc10d4f77e10
-%global commitdate 20240404
-%global gittag v0.2.109
+%global commit 72139d86ea1e90a4256c78c5eab6827ed58215b1
+%global commitdate 20241223
+%global gittag v3.0.0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	0.2.109%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	3%{?dist}
+Version:	3.0.0%{?snapshot:^%{commitdate}git%{shortcommit}}
+Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # Main ocp source is GPL-2.0-or-later.
@@ -63,7 +63,7 @@ Requires:	unifont-fonts
 
 # Bundled code
 Provides:	bundled(timidity++) = 2.15.0
-Provides:	bundled(libsidplayfp) = 2.7.0b
+Provides:	bundled(libsidplayfp) = 2.12.0
 Provides:	bundled(adplug) = 2.3.4-beta
 Provides:	bundled(libbinio) = 1.5
 Provides:	bundled(reSID) = 1.0-pre2
@@ -176,6 +176,10 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue Dec 24 2024 Charles R. Anderson <cra@alum.wpi.edu> - 3.0.0-1
+- Update to 3.0.0
+- Adds modland.com support directly from the file browser
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.109-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index 095e5a6..a79bfdc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-0.2.109.tar.bz2) = 37e0121bb5fd80499334a23e7fc473240830df788a3f8d5846a894dc4977f7d99a57ee2218b32705cf98f0310246076b50d2ba2ac1b989e4e030ee7da7675108
+SHA512 (ocp-3.0.0.tar.bz2) = fa76ed63df4b4614551b65171501a2c20673e0a3329257c8014140f26edec2914d8b367162ede62406d2e23bb9f66d13d856289755c821af1aa2b05a3a48cd4c
 SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
 SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From b395b94a43b7ea5e480e2009d6128a43d7b1e9ce Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Jan 2025 12:29:54 -0500
Subject: [PATCH 55/59] Update to 3.0.1

Bugfix release, with the exception of adplug adding support for "Palladix" files.
---
 ocp.spec | 12 ++++++++----
 sources  |  4 +---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ocp.spec b/ocp.spec
index ba009bf..8f4c60b 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,11 @@
 #global snapshot 0
-%global commit 72139d86ea1e90a4256c78c5eab6827ed58215b1
-%global commitdate 20241223
-%global gittag v3.0.0
+%global commit afbb1dfc61a83b9e87666d4504ee063dcd90f2be
+%global commitdate 20241229
+%global gittag v3.0.1
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	3.0.0%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	3.0.1%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -176,6 +176,10 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Wed Jan 08 2025 Charles R. Anderson <cra@alum.wpi.edu> - 3.0.1-1
+- Update to 3.0.1
+- Bugfix release, with the exception of adplug adding support for "Palladix" files.
+
 * Tue Dec 24 2024 Charles R. Anderson <cra@alum.wpi.edu> - 3.0.0-1
 - Update to 3.0.0
 - Adds modland.com support directly from the file browser
diff --git a/sources b/sources
index a79bfdc..aba8747 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (ocp-3.0.0.tar.bz2) = fa76ed63df4b4614551b65171501a2c20673e0a3329257c8014140f26edec2914d8b367162ede62406d2e23bb9f66d13d856289755c821af1aa2b05a3a48cd4c
-SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
-SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
+SHA512 (ocp-3.0.1.tar.bz2) = 160d0636151ee046255fbcc51ce5df5575ae5871f77e696c4d82d8f217492072f00edbebbad1d621480990513f0a241de970e770890b074a9c9c02ac7f5ce508

From 81a92e1363eb57b244459c61767b854ee7962a52 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@alum.wpi.edu>
Date: Wed, 8 Jan 2025 19:27:54 -0500
Subject: [PATCH 56/59] add missing zip files to sources

---
 sources | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sources b/sources
index aba8747..02ab2ce 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (ocp-3.0.1.tar.bz2) = 160d0636151ee046255fbcc51ce5df5575ae5871f77e696c4d82d8f217492072f00edbebbad1d621480990513f0a241de970e770890b074a9c9c02ac7f5ce508
+SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
+SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423

From 8195628194db82d0535882fceacde12f312a096c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 21:15:09 +0000
Subject: [PATCH 57/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 8f4c60b..6c76adf 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	3.0.1%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # Main ocp source is GPL-2.0-or-later.
@@ -176,6 +176,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jan 08 2025 Charles R. Anderson <cra@alum.wpi.edu> - 3.0.1-1
 - Update to 3.0.1
 - Bugfix release, with the exception of adplug adding support for "Palladix" files.

From 53136e2a75722e497959c4ac22fbda43e2b73056 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 27 May 2025 17:30:04 +0200
Subject: [PATCH 58/59] Rebuilt for flac 1.5.0

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index 6c76adf..e4f0361 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	3.0.1%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # Main ocp source is GPL-2.0-or-later.
@@ -176,6 +176,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue May 27 2025 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.1-3
+- Rebuilt for flac 1.5.0
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From e71f6f5c924e54ddf86384b0fc768f118f63c51c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 23:23:07 +0000
Subject: [PATCH 59/59] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 ocp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ocp.spec b/ocp.spec
index e4f0361..3327fad 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -6,7 +6,7 @@
 
 Name:		ocp
 Version:	3.0.1%{?snapshot:^%{commitdate}git%{shortcommit}}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
 # Main ocp source is GPL-2.0-or-later.
@@ -176,6 +176,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Tue May 27 2025 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.1-3
 - Rebuilt for flac 1.5.0