From e67a9732f661e191856358fd265962fc730036fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:56:15 +0000 Subject: [PATCH 01/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index ecff511..879aabb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 2.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From af63436465447f5e17b031090a40f9c50ebbae2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:01:51 +0000 Subject: [PATCH 02/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 879aabb..dff71fd 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c4c2e21deacd8df974483ad262fc124ff173271d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 25 Jul 2018 12:37:18 +0200 Subject: [PATCH 03/31] BR: gcc-c++ Signed-off-by: Igor Gnatenko --- adplug.spec | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/adplug.spec b/adplug.spec index dff71fd..82d34a6 100644 --- a/adplug.spec +++ b/adplug.spec @@ -12,6 +12,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch License: LGPLv2+ +BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo @@ -36,8 +37,6 @@ Summary: Development files for AdPlug Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description devel This package contains development files for the AdPlug AdLib @@ -72,17 +71,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post devel -/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then -/sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : -fi +%ldconfig_scriptlets %files %{_libdir}/*.so.* From e85cfee3b5c6657a12761677c96d1506683c925b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 15 Dec 2018 02:16:06 +0100 Subject: [PATCH 04/31] Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) --- adplug-2.3.1-cve-2018-17825.patch | 25 +++++++++++++++++++++++++ adplug.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 adplug-2.3.1-cve-2018-17825.patch diff --git a/adplug-2.3.1-cve-2018-17825.patch b/adplug-2.3.1-cve-2018-17825.patch new file mode 100644 index 0000000..bbf7701 --- /dev/null +++ b/adplug-2.3.1-cve-2018-17825.patch @@ -0,0 +1,25 @@ +From 19ebb61bf92262dc1868de10ba5a211db249ce76 Mon Sep 17 00:00:00 2001 +From: Stas'M +Date: Thu, 4 Oct 2018 00:18:32 +0300 +Subject: [PATCH] FMOPL: Avoid double-free by checking OPL pointer (fix #67) + +Fixes CVE-2018-17825. +--- + src/fmopl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/fmopl.c b/src/fmopl.c +index 0cd1d69..1c4485e 100644 +--- a/src/fmopl.c ++++ b/src/fmopl.c +@@ -1269,6 +1269,10 @@ FM_OPL *OPLCreate(int type, int clock, int rate) + /* ---------- Destroy one of vietual YM3812 ---------- */ + void OPLDestroy(FM_OPL *OPL) + { ++ if(!OPL) ++ { ++ return; ++ } + #ifdef OPL_OUTPUT_LOG + if(opl_dbg_fp) + { diff --git a/adplug.spec b/adplug.spec index 82d34a6..f1d3fb4 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,13 +4,14 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch +Patch1: adplug-2.3.1-cve-2018-17825.patch License: LGPLv2+ BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 @@ -45,6 +46,7 @@ This package contains development files for the AdPlug AdLib %prep %setup -q %patch0 -p1 +%patch1 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb @@ -90,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Sat Dec 15 2018 Robert Scheck - 2.2.1-7 +- Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) + * Thu Jul 12 2018 Fedora Release Engineering - 2.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 13c9e5c88db121063b8360c349d867b578f3a95d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 15 Dec 2018 02:16:40 +0100 Subject: [PATCH 05/31] Try to fix bogus date warnings in %changelog --- adplug.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index f1d3fb4..5b1cf0f 100644 --- a/adplug.spec +++ b/adplug.spec @@ -199,7 +199,7 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} the database actually. And it is obviously OK to create and own directories under /var/lib as opposed to /var. -* Thu Mar 31 2006 Linus Walleij 1.5.1-7.20060323cvs +* Thu Mar 30 2006 Linus Walleij 1.5.1-7.20060323cvs - Patching to move database from /var/adplug to just /var since FHS does not like creation of directories under /var. @@ -218,7 +218,7 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} - Fixed scriptlet problems under non-shell environments. - Make adplug-devel require libbinio-devel. -* Sun Jan 09 2006 Linus Walleij 1.5.1-2.20060101cvs +* Sun Jan 08 2006 Linus Walleij 1.5.1-2.20060101cvs - Did a clean-up rollercoaster ride. * Sun Jan 01 2006 Linus Walleij 1.5.1-1.20060101cvs From bce1e02d9ac7fe8aac330269f31e4d6c7b7f2e17 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 06/31] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- adplug.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 5b1cf0f..f084dbf 100644 --- a/adplug.spec +++ b/adplug.spec @@ -7,7 +7,6 @@ Version: 2.2.1 Release: 7%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ -Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch @@ -35,7 +34,6 @@ playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel Summary: Development files for AdPlug -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel From 61209b8da32883fd38c2df732f6327a1fb597d2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:01:21 +0000 Subject: [PATCH 07/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index f084dbf..6739178 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Dec 15 2018 Robert Scheck - 2.2.1-7 - Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) From af330db2e9212d97f343309b699049a6021c9fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 24 Apr 2019 14:56:28 +0200 Subject: [PATCH 08/31] Remove hardcoded gzip suffix from GNU info pages --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 6739178..5b5b6eb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Wed Apr 24 2019 Björn Esser - 2.2.1-9 +- Remove hardcoded gzip suffix from GNU info pages + * Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dc0507b1a581bba90b8d9219ef20be82cf4daa80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:37:11 +0000 Subject: [PATCH 09/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 5b5b6eb..462f04b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Apr 24 2019 Björn Esser - 2.2.1-9 - Remove hardcoded gzip suffix from GNU info pages From dc7aace7b956fd86d574f4b846b48fde8b959f3a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 31 Jul 2019 20:30:00 +0200 Subject: [PATCH 10/31] Avoid undefined reference to `OPL_CALC_RH' --- adplug-2.2.1-inline.patch | 17 +++++++++++++++++ adplug.spec | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 adplug-2.2.1-inline.patch diff --git a/adplug-2.2.1-inline.patch b/adplug-2.2.1-inline.patch new file mode 100644 index 0000000..aaf142b --- /dev/null +++ b/adplug-2.2.1-inline.patch @@ -0,0 +1,17 @@ +Patch by Robert Scheck for adplug >= 2.2.1, which +works around undefined reference linking error when using GCC >= 9.1 (while +it works with GCC 9.0.x and older): + +/usr/bin/ld: ../src/.libs/libadplug.so: undefined reference to `OPL_CALC_RH' + +--- adplug-2.2.1/src/fmopl.c 2003-11-03 16:41:33.000000000 +0100 ++++ adplug-2.2.1/src/fmopl.c.inline 2019-07-31 19:57:40.925132660 +0200 +@@ -31,7 +31,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#define INLINE __inline ++#define INLINE + #define HAS_YM3812 1 + + #include diff --git a/adplug.spec b/adplug.spec index 462f04b..9ca0712 100644 --- a/adplug.spec +++ b/adplug.spec @@ -11,6 +11,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch Patch1: adplug-2.3.1-cve-2018-17825.patch +Patch2: adplug-2.2.1-inline.patch License: LGPLv2+ BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 @@ -45,6 +46,7 @@ This package contains development files for the AdPlug AdLib %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb From fd8568035bf0a46237202bcded0f86b85b61b2b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:16:35 +0000 Subject: [PATCH 11/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9ca0712..5dbc14b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 31fb5982116eb5c3ee79b08cb157c0550f55cb73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:47:51 +0000 Subject: [PATCH 12/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 5dbc14b..a8d439c 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.2.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 21c334fb10e98082ad357e45e0cd9b2129b211c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:49:38 +0000 Subject: [PATCH 13/31] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index a8d439c..93e2df6 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,10 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.2.1-13 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0212d331dda115f233a26dd9cef6f063e7bb9dff Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:54:07 +0000 Subject: [PATCH 14/31] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- adplug.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/adplug.spec b/adplug.spec index 93e2df6..af20cfc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -20,6 +20,7 @@ BuildRequires: texinfo BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake +BuildRequires: make # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. From 843cf78ed4dadcf4ef9a4a441f88bf8ff0539157 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 5 Jan 2021 04:20:31 +0100 Subject: [PATCH 15/31] Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, #1778710, #1778716, #1778720) --- .gitignore | 7 ++- adplug-2.2.1-inline.patch | 17 ------ adplug-2.2.1-signed-char.patch | 24 --------- adplug-2.3.1-cve-2018-17825.patch | 25 --------- adplug.spec | 90 +++++++++++++++---------------- sources | 4 +- 6 files changed, 50 insertions(+), 117 deletions(-) delete mode 100644 adplug-2.2.1-inline.patch delete mode 100644 adplug-2.2.1-signed-char.patch delete mode 100644 adplug-2.3.1-cve-2018-17825.patch diff --git a/.gitignore b/.gitignore index 6c8745f..b77bfd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -adplug-2.1.tar.bz2 -adplugdb-2006-07-07.tar.gz -/adplug-2.2.1.tar.gz -/adplug-2.2.1.tar.bz2 +/adplug-*.tar.gz +/adplug-*.tar.bz2 +/adplugdb-*.tar.gz diff --git a/adplug-2.2.1-inline.patch b/adplug-2.2.1-inline.patch deleted file mode 100644 index aaf142b..0000000 --- a/adplug-2.2.1-inline.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch by Robert Scheck for adplug >= 2.2.1, which -works around undefined reference linking error when using GCC >= 9.1 (while -it works with GCC 9.0.x and older): - -/usr/bin/ld: ../src/.libs/libadplug.so: undefined reference to `OPL_CALC_RH' - ---- adplug-2.2.1/src/fmopl.c 2003-11-03 16:41:33.000000000 +0100 -+++ adplug-2.2.1/src/fmopl.c.inline 2019-07-31 19:57:40.925132660 +0200 -@@ -31,7 +31,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#define INLINE __inline -+#define INLINE - #define HAS_YM3812 1 - - #include diff --git a/adplug-2.2.1-signed-char.patch b/adplug-2.2.1-signed-char.patch deleted file mode 100644 index ec3baf0..0000000 --- a/adplug-2.2.1-signed-char.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur adplug-2.2.1-orig/src/s3m.cpp adplug-2.2.1/src/s3m.cpp ---- adplug-2.2.1-orig/src/s3m.cpp 2016-06-12 17:19:33.369934280 +0200 -+++ adplug-2.2.1/src/s3m.cpp 2016-06-12 17:32:36.190932642 +0200 -@@ -25,7 +25,7 @@ - #include - #include "s3m.h" - --const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion -+const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; - - const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table -diff -ur adplug-2.2.1-orig/src/s3m.h adplug-2.2.1/src/s3m.h ---- adplug-2.2.1-orig/src/s3m.h 2016-06-12 17:19:33.367934293 +0200 -+++ adplug-2.2.1/src/s3m.h 2016-06-12 17:37:14.538154102 +0200 -@@ -90,7 +90,7 @@ - unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt; - - private: -- static const char chnresolv[]; -+ static const signed char chnresolv[]; - static const unsigned short notetable[12]; - static const unsigned char vibratotab[32]; - diff --git a/adplug-2.3.1-cve-2018-17825.patch b/adplug-2.3.1-cve-2018-17825.patch deleted file mode 100644 index bbf7701..0000000 --- a/adplug-2.3.1-cve-2018-17825.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 19ebb61bf92262dc1868de10ba5a211db249ce76 Mon Sep 17 00:00:00 2001 -From: Stas'M -Date: Thu, 4 Oct 2018 00:18:32 +0300 -Subject: [PATCH] FMOPL: Avoid double-free by checking OPL pointer (fix #67) - -Fixes CVE-2018-17825. ---- - src/fmopl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/fmopl.c b/src/fmopl.c -index 0cd1d69..1c4485e 100644 ---- a/src/fmopl.c -+++ b/src/fmopl.c -@@ -1269,6 +1269,10 @@ FM_OPL *OPLCreate(int type, int clock, int rate) - /* ---------- Destroy one of vietual YM3812 ---------- */ - void OPLDestroy(FM_OPL *OPL) - { -+ if(!OPL) -+ { -+ return; -+ } - #ifdef OPL_OUTPUT_LOG - if(opl_dbg_fp) - { diff --git a/adplug.spec b/adplug.spec index af20cfc..d93d3bb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -2,25 +2,19 @@ # RPM repository. %define adplugdbver 2006-07-07 -Name: adplug -Version: 2.2.1 -Release: 13%{?dist} -Summary: A software library for AdLib (OPL2) emulation -URL: http://adplug.github.io/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -Patch0: adplug-2.2.1-signed-char.patch -Patch1: adplug-2.3.1-cve-2018-17825.patch -Patch2: adplug-2.2.1-inline.patch +Name: adplug +Version: 2.3.3 +Release: 1%{?dist} +Summary: Software library for AdLib (OPL2/3) emulation +URL: https://adplug.github.io/ +Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz License: LGPLv2+ BuildRequires: gcc-c++ -BuildRequires: libbinio-devel >= 1.4 -BuildRequires: pkgconfig -BuildRequires: texinfo -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: make +BuildRequires: make +BuildRequires: libbinio-devel >= 1.4 +BuildRequires: pkgconfig +BuildRequires: texinfo # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. @@ -28,61 +22,63 @@ BuildRequires: make %description AdPlug is a free software, cross-platform, hardware independent AdLib -sound player library, mainly written in C++ and released under the -LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) -audio board, directly from its original format on top of an OPL2 -emulator or by using the real hardware. No OPL chip is required for -playback. It supports various audio formats from MS-DOS AdLib trackers. +sound player library, mainly written in C++. AdPlug plays sound data, +originally created for the AdLib (OPL2/3) audio board, directly from +its original format on top of an OPL2/3 emulator or by using the real +hardware. No OPL2/3 chips are required for playback. %package devel Summary: Development files for AdPlug Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libbinio-devel +Requires: libbinio-devel +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +%endif %description devel -This package contains development files for the AdPlug AdLib -(OPL2) emulator. +This package contains development files for the AdPlug AdLib (OPL2/3) +emulator. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb mv %{adplugdbver}/NEWS NEWS.adplugdb %build -rm -f ltmain.sh config.guess config.sub -libtoolize --copy --force || fail -rm -f aclocal.m4 -aclocal $ACLOCAL_FLAGS || fail -rm -f depcomp install-sh missing -touch config.rpath -automake --add-missing --gnu || fail -rm -f configure -autoconf -%configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath -make %{?_smp_mflags} +%configure --disable-static --sharedstatedir=%{shareddata} +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%make_build %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir -mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} -install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} +install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name}/adplug.db %ldconfig_scriptlets +%if 0%{?rhel} && 0%{?rhel} <= 7 +%post devel +/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : + +%preun devel +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : +fi +%endif + %files %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ %config(noreplace) %{shareddata}/%{name}/adplug.db %{_bindir}/adplugdb %{_mandir}/man1/adplugdb.1* -%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO +%license COPYING +%doc AUTHORS BUGS ChangeLog NEWS README %doc NEWS.adplugdb README.adplugdb %files devel @@ -90,9 +86,13 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h -%{_infodir}/*.gz +%{_infodir}/libadplug.info* %changelog +* Tue Jan 05 2021 Robert Scheck - 2.3.3-1 +- Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, + #1778710, #1778716, #1778720) + * Fri Jul 31 2020 Fedora Release Engineering - 2.2.1-13 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3a8cf58..1a2ad47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8f815fd5d254de0fe5df818df9d1d8af adplug-2.2.1.tar.bz2 -40a1cc1222c7318172ee3740c4269df3 adplugdb-2006-07-07.tar.gz +SHA512 (adplug-2.3.3.tar.bz2) = 08647c746df69aa0a3941ee64d3adecd11a46febf51fe1bb9fe16ff01a6fef56321b18618f5ecb66309b8cdac8493a067707759fbdf0e91d556677c6b4c57a44 +SHA512 (adplugdb-2006-07-07.tar.gz) = c3391ac83b8433a94f036affd8618f1202499890056b9799854f66806b76a4ededc61b41ea7548bbe50e545fc5c7e33754c4e15bb940d34b7135cc9b5f129501 From 7f591a4d87d26a4717fe8c0c26fa965c43772833 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:51:26 +0000 Subject: [PATCH 16/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index d93d3bb..9c39156 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 05 2021 Robert Scheck - 2.3.3-1 - Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, #1778710, #1778716, #1778720) From fb6956f58ebc34ef57526b6a9e9509f0b51df4b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:23:34 +0000 Subject: [PATCH 17/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 815d0f3fffefb7a611bd867a0751eda09a2ecc38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:18:50 +0000 Subject: [PATCH 18/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9c39156..954e539 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7b7a355a4cad4417c84d3b44a21dda38f34b907a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:59:04 +0000 Subject: [PATCH 19/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 954e539..dc450ce 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 17d6fdb5b4e415ca5982af4d0ef8d255bc79e100 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:30:02 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index dc450ce..240b246 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ed8e53b9f4d5c3d231e56124e71dbb9b6e33ad05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:27:21 +0000 Subject: [PATCH 21/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 240b246..882ab08 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3a5c96bed050c39af25a54f7c398319f2d5013b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:58:03 +0000 Subject: [PATCH 22/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 882ab08..dd31db2 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2a0338b743dc09e5d24c06e5ee3f5909ebf52b5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:17:56 +0000 Subject: [PATCH 23/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index dd31db2..46a4621 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ea12a0e48c4b1f13bbdad9813f0960f71a9a54a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:43:38 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 46a4621..548e153 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 076e95ac6776e16595ee9a2ed6be69b55ccae280 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:39:42 +0000 Subject: [PATCH 25/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 548e153..06be505 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.3.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0a2d2504e1e77a97b1682968dbb580ddcb93afbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 07:47:06 +0200 Subject: [PATCH 26/31] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- adplug.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 06be505..58015dc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,12 +4,13 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libbinio-devel >= 1.4 @@ -89,6 +90,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Aug 28 2024 Miroslav Suchý - 2.3.3-11 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.3.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a5dfe1ad99375943d4881ed51bf5ea43678dc629 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 13:43:45 +0100 Subject: [PATCH 27/31] Remove EPEL 7 build-time support --- adplug.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/adplug.spec b/adplug.spec index 58015dc..56ae909 100644 --- a/adplug.spec +++ b/adplug.spec @@ -32,10 +32,6 @@ hardware. No OPL2/3 chips are required for playback. Summary: Development files for AdPlug Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%endif %description devel This package contains development files for the AdPlug AdLib (OPL2/3) @@ -62,16 +58,6 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %ldconfig_scriptlets -%if 0%{?rhel} && 0%{?rhel} <= 7 -%post devel -/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : -fi -%endif - %files %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ From 6af33d289fc4adbf5abdc55c5088c6b893e8665c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 14:02:34 +0100 Subject: [PATCH 28/31] Reviewed automatically converted license tag --- adplug.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 56ae909..af3d10c 100644 --- a/adplug.spec +++ b/adplug.spec @@ -9,8 +9,7 @@ Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPL-2.1-or-later AND GFDL-1.1-or-later BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libbinio-devel >= 1.4 From 2eeb9bbfe770218473d73f1087bfc313e7282569 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:39:25 +0000 Subject: [PATCH 29/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index af3d10c..9103e96 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 2.3.3-11 - convert license to SPDX From 1c80d83e8e80b38a4a86dd070062686ec9b02ca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:47:36 +0000 Subject: [PATCH 30/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9103e96..127c27f 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b7653a45a245474056b4f4167e90ed8bea3dbaa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:28:55 +0000 Subject: [PATCH 31/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 127c27f..337ea08 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.3.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild