From 37aced9241f4b59e5d42e0af934a10028828fc0c Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:29 +0000 Subject: [PATCH 01/67] Setup of module libmodplug --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2598696 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: libmodplug +# $Id$ +NAME := libmodplug +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 56e9a291139c33b6cc1159a0a26c775b3ed4c68c Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:31 +0000 Subject: [PATCH 02/67] auto-import changelog data from libmodplug-0.7-0.fdr.1.rh90.src.rpm 0.7-0.fdr.1 - First build, separated from xmms-modplug. - Bump Epoch. --- .cvsignore | 1 + libmodplug.spec | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 67 insertions(+) create mode 100644 libmodplug.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3d14494 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libmodplug-0.7.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec new file mode 100644 index 0000000..5caa8dd --- /dev/null +++ b/libmodplug.spec @@ -0,0 +1,65 @@ +Name: libmodplug +Version: 0.7 +Release: 0.fdr.1.rh90 +Epoch: 1 +Summary: Modplug mod music file format library + +Group: System Environment/Libraries +License: Public Domain +URL: http://modplug-xmms.sourceforge.net/ +Source0: http://dl.sf.net/modplug-xmms/libmodplug-0.7.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +%{summary}. + +%package devel +Summary: Development files for the Modplug mod music file format library +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig + +%description devel +%{summary}. + + +%prep +%setup -q + + +%build +%configure --enable-static +make %{?_smp_mflags} +make check + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README TODO +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/* +%{_libdir}/*.a +%{_libdir}/*.so +%{_libdir}/pkgconfig/* + + +%changelog +* Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 +- First build, separated from xmms-modplug. +- Bump Epoch. diff --git a/sources b/sources index e69de29..f8fee3c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz From 51aff1e8d68d0d2ec08d8dd8fd4994327de942b2 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:37 +0000 Subject: [PATCH 03/67] auto-import libmodplug-0.7-0.fdr.1.1 from libmodplug-0.7-0.fdr.1.1.src.rpm --- libmodplug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 5caa8dd..268f645 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.7 -Release: 0.fdr.1.rh90 +Release: 0.fdr.1.1 Epoch: 1 Summary: Modplug mod music file format library From 679be911b708cdbce61d590cf4413ce65e4f620d Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 04:45:43 +0000 Subject: [PATCH 04/67] auto-import libmodplug-0.7-0.fdr.1.2 from libmodplug-0.7-0.fdr.1.2.src.rpm --- libmodplug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 268f645..b63be9e 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.7 -Release: 0.fdr.1.1 +Release: 0.fdr.1.2 Epoch: 1 Summary: Modplug mod music file format library From fe7ba1677bc2a307e61b1ea5710d1c410c5fb8d3 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 04:25:00 +0000 Subject: [PATCH 05/67] Fix braindead typo from the original import --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2598696..8643ffd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for source rpm: libmodplug -# $Id$ +# $Id: Makefile,v 1.1 2004/11/08 04:45:29 cvsextras Exp $ NAME := libmodplug SPECFILE = $(firstword $(wildcard *.spec)) @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) From bd98fd73ca5deea7aebf6d856478ff58f0820c4d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 10 Dec 2004 22:03:05 +0000 Subject: [PATCH 06/67] Bump release, strip off fedora.us prefix and dist tag. --- libmodplug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index b63be9e..df8ad50 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.7 -Release: 0.fdr.1.2 +Release: 1 Epoch: 1 Summary: Modplug mod music file format library From dde2771995267f3e8cdbbaf36d3ae5a83677f375 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 21:10:22 +0000 Subject: [PATCH 07/67] Further mass cleanup. One or more apply : - Remove (hopefully) all zero epoch remains. - Remove trailing spaces and tabs. - Keep consistency between tabs and spaces. - Clean up summary. --- libmodplug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index df8ad50..a8fbabc 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for the Modplug mod music file format library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig +Requires: %{name} = %{version}-%{release}, pkgconfig %description devel %{summary}. From a5bf22cd9cd32e691a1c89536c54dbe76bbf7251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Mar 2005 19:12:32 +0000 Subject: [PATCH 08/67] Restore incorrectly removed Epoch from -devel dependency, other minor tweaks. --- libmodplug.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index a8fbabc..39b3d04 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.7 -Release: 1 +Release: 2 Epoch: 1 Summary: Modplug mod music file format library @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for the Modplug mod music file format library Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig +Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig %description devel %{summary}. @@ -27,9 +27,8 @@ Requires: %{name} = %{version}-%{release}, pkgconfig %build -%configure --enable-static +%configure --enable-static --disable-dependency-tracking make %{?_smp_mflags} -make check %install @@ -38,6 +37,10 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%check || : +make check + + %clean rm -rf $RPM_BUILD_ROOT @@ -60,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 +- Build with dependency tracking disabled. +- Run tests in the %%check section. + * Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 - First build, separated from xmms-modplug. - Bump Epoch. From 25f698083cc381c3449ddaca8070ac8d85dd77a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 23 Aug 2005 16:10:13 +0000 Subject: [PATCH 09/67] - Don't ship static libs. 0.7-3 - Fix x86_64, thanks to Adam Goode (#166127). --- libmodplug-64bit.patch | 37 +++++++++++++++++++++++++++++++++++++ libmodplug.spec | 28 ++++++++++++++++++---------- 2 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 libmodplug-64bit.patch diff --git a/libmodplug-64bit.patch b/libmodplug-64bit.patch new file mode 100644 index 0000000..78ca7c3 --- /dev/null +++ b/libmodplug-64bit.patch @@ -0,0 +1,37 @@ +--- libmodplug/src/libmodplug/stdafx.h ++++ libmodplug/src/libmodplug/stdafx.h +@@ -31,21 +31,31 @@ + typedef unsigned char UCHAR; + typedef unsigned char* PUCHAR; + typedef unsigned short USHORT; ++#if defined(_LP64) ++typedef unsigned int ULONG; ++typedef unsigned int UINT; ++typedef unsigned int DWORD; ++typedef int LONG; ++typedef long LONGLONG; ++typedef int * LPLONG; ++typedef unsigned int * LPDWORD; ++#else + typedef unsigned long ULONG; + typedef unsigned long UINT; + typedef unsigned long DWORD; + typedef long LONG; ++typedef long long LONGLONG; ++typedef long * LPLONG; ++typedef unsigned long * LPDWORD; ++#endif + typedef unsigned short WORD; + typedef unsigned char BYTE; + typedef unsigned char * LPBYTE; + typedef bool BOOL; + typedef char * LPSTR; + typedef void * LPVOID; +-typedef long * LPLONG; +-typedef unsigned long * LPDWORD; + typedef unsigned short * LPWORD; + typedef const char * LPCSTR; +-typedef long long LONGLONG; + typedef void * PVOID; + typedef void VOID; + diff --git a/libmodplug.spec b/libmodplug.spec index 39b3d04..7114fd4 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,13 +1,14 @@ Name: libmodplug Version: 0.7 -Release: 2 +Release: 4%{?dist} Epoch: 1 Summary: Modplug mod music file format library Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ -Source0: http://dl.sf.net/modplug-xmms/libmodplug-0.7.tar.gz +Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz +Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -16,7 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for the Modplug mod music file format library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: pkgconfig %description devel %{summary}. @@ -24,10 +26,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}, pkgconfig %prep %setup -q +%patch0 -p1 %build -%configure --enable-static --disable-dependency-tracking +%configure --disable-dependency-tracking make %{?_smp_mflags} @@ -37,7 +40,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%check || : +%check make check @@ -52,17 +55,22 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO -%{_libdir}/*.so.* +%{_libdir}/libmodplug.so.* %files devel %defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so -%{_libdir}/pkgconfig/* +%{_includedir}/libmodplug/ +%{_libdir}/libmodplug.so +%{_libdir}/pkgconfig/libmodplug.pc %changelog +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 +- Don't ship static libs. + +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-3 +- Fix x86_64, thanks to Adam Goode (#166127). + * Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 - Build with dependency tracking disabled. - Run tests in the %%check section. From eaddb5e229ef484eaa4ae7da6c01bce2b5bd7613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 13 Feb 2006 20:15:00 +0000 Subject: [PATCH 10/67] - Rebuild, cosmetics. --- libmodplug.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 7114fd4..0bef9a0 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -27,6 +27,7 @@ Requires: pkgconfig %prep %setup -q %patch0 -p1 +sed -i -e 's/\r//g' ChangeLog %build @@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 +- Rebuild, cosmetics. + * Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 - Don't ship static libs. From 04a33abcf2ec1ea29b65a9ddb0a645a822a83fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 24 Mar 2006 20:36:44 +0000 Subject: [PATCH 11/67] - 0.8, 64bit patch included upstream. --- .cvsignore | 2 +- libmodplug-64bit.patch | 37 ------------------------------------- libmodplug.spec | 11 +++++++---- sources | 2 +- 4 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 libmodplug-64bit.patch diff --git a/.cvsignore b/.cvsignore index 3d14494..c2b4daf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.7.tar.gz +libmodplug-0.8.tar.gz diff --git a/libmodplug-64bit.patch b/libmodplug-64bit.patch deleted file mode 100644 index 78ca7c3..0000000 --- a/libmodplug-64bit.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- libmodplug/src/libmodplug/stdafx.h -+++ libmodplug/src/libmodplug/stdafx.h -@@ -31,21 +31,31 @@ - typedef unsigned char UCHAR; - typedef unsigned char* PUCHAR; - typedef unsigned short USHORT; -+#if defined(_LP64) -+typedef unsigned int ULONG; -+typedef unsigned int UINT; -+typedef unsigned int DWORD; -+typedef int LONG; -+typedef long LONGLONG; -+typedef int * LPLONG; -+typedef unsigned int * LPDWORD; -+#else - typedef unsigned long ULONG; - typedef unsigned long UINT; - typedef unsigned long DWORD; - typedef long LONG; -+typedef long long LONGLONG; -+typedef long * LPLONG; -+typedef unsigned long * LPDWORD; -+#endif - typedef unsigned short WORD; - typedef unsigned char BYTE; - typedef unsigned char * LPBYTE; - typedef bool BOOL; - typedef char * LPSTR; - typedef void * LPVOID; --typedef long * LPLONG; --typedef unsigned long * LPDWORD; - typedef unsigned short * LPWORD; - typedef const char * LPCSTR; --typedef long long LONGLONG; - typedef void * PVOID; - typedef void VOID; - diff --git a/libmodplug.spec b/libmodplug.spec index 0bef9a0..5318150 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.7 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,7 +8,6 @@ Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,7 +25,7 @@ Requires: pkgconfig %prep %setup -q -%patch0 -p1 +chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -50,6 +49,7 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 +- 0.8, 64bit patch included upstream. + * Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 - Rebuild, cosmetics. diff --git a/sources b/sources index f8fee3c..a9ff753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz +cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz From 51614968fafe801225c257159c8165b24df123d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:36:31 +0000 Subject: [PATCH 12/67] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From fe6f62862d5525fc34384f2ab124c8d83d2cabe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 28 Aug 2006 16:08:17 +0000 Subject: [PATCH 13/67] - Rebuild. --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 5318150..b887e9c 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 +- Rebuild. + * Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 - 0.8, 64bit patch included upstream. From f9ef6ccb6b3bb21166ef529ddd4561e38e8f71f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 28 Aug 2006 16:27:58 +0000 Subject: [PATCH 14/67] Successfully rebuilt. --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 7eb95f9c5e3d5ccdeda65a7d74b11000512acb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 3 Oct 2006 17:05:08 +0000 Subject: [PATCH 15/67] - Apply patch for CVE-2006-4192 (from Debian). --- libmodplug-0.8-CVE-2006-4192.patch | 11 +++++++++++ libmodplug.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libmodplug-0.8-CVE-2006-4192.patch diff --git a/libmodplug-0.8-CVE-2006-4192.patch b/libmodplug-0.8-CVE-2006-4192.patch new file mode 100644 index 0000000..24ee38e --- /dev/null +++ b/libmodplug-0.8-CVE-2006-4192.patch @@ -0,0 +1,11 @@ +--- libmodplug-0.8/src/sndfile.cpp~ 2006-03-20 05:22:32.000000000 +0200 ++++ libmodplug-0.8/src/sndfile.cpp 2006-10-03 19:21:17.000000000 +0300 +@@ -1081,7 +1081,7 @@ + { + UINT len = 0, mem = pIns->nLength+6; + +- if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0; ++ if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0; + if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH; + pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO); + if (nFlags & RSF_16BIT) diff --git a/libmodplug.spec b/libmodplug.spec index b887e9c..b2098d3 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,6 +8,7 @@ Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz +Patch0: %{name}-0.8-CVE-2006-4192.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -25,6 +26,7 @@ Requires: pkgconfig %prep %setup -q +%patch0 -p1 chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 +- Apply patch for CVE-2006-4192 (from Debian). + * Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 - Rebuild. From 1a2593eff4e7284fc390b5543fc9f32d1df3d2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 5 Apr 2007 10:10:05 +0000 Subject: [PATCH 16/67] - 0.8.4. --- .cvsignore | 2 +- libmodplug-0.8-CVE-2006-4192.patch | 11 ---------- libmodplug-0.8.4-timiditypaths.patch | 33 ++++++++++++++++++++++++++++ libmodplug.spec | 11 ++++++---- sources | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) delete mode 100644 libmodplug-0.8-CVE-2006-4192.patch create mode 100644 libmodplug-0.8.4-timiditypaths.patch diff --git a/.cvsignore b/.cvsignore index c2b4daf..f7a2daa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.8.tar.gz +libmodplug-0.8.4.tar.gz diff --git a/libmodplug-0.8-CVE-2006-4192.patch b/libmodplug-0.8-CVE-2006-4192.patch deleted file mode 100644 index 24ee38e..0000000 --- a/libmodplug-0.8-CVE-2006-4192.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libmodplug-0.8/src/sndfile.cpp~ 2006-03-20 05:22:32.000000000 +0200 -+++ libmodplug-0.8/src/sndfile.cpp 2006-10-03 19:21:17.000000000 +0300 -@@ -1081,7 +1081,7 @@ - { - UINT len = 0, mem = pIns->nLength+6; - -- if ((!pIns) || (pIns->nLength < 4) || (!lpMemFile)) return 0; -+ if ((!pIns) || ((int)pIns->nLength < 4) || (!lpMemFile)) return 0; - if (pIns->nLength > MAX_SAMPLE_LENGTH) pIns->nLength = MAX_SAMPLE_LENGTH; - pIns->uFlags &= ~(CHN_16BIT|CHN_STEREO); - if (nFlags & RSF_16BIT) diff --git a/libmodplug-0.8.4-timiditypaths.patch b/libmodplug-0.8.4-timiditypaths.patch new file mode 100644 index 0000000..9fbdbba --- /dev/null +++ b/libmodplug-0.8.4-timiditypaths.patch @@ -0,0 +1,33 @@ +--- libmodplug-0.8.4/README~ 2006-11-02 05:26:30.000000000 +0200 ++++ libmodplug-0.8.4/README 2007-04-04 20:39:53.000000000 +0300 +@@ -57,7 +57,7 @@ + + MMPAT_PATH_TO_CFG set to the directory where the file "timidity.cfg" and + the subdirectory "instruments" can be found, +- default: "/usr/local/share/timidity". ++ default: "/usr/share/timidity". + MMMID_SPEED for experimenting with the mod speed (1 thru 9) + MMMID_VERBOSE for feedback on the conversion process + MMMID_DEBUG for sake of completeness, only useful for maintainers +@@ -68,7 +68,7 @@ + + MMPAT_PATH_TO_CFG set to the directory where the file "timidity.cfg" and + the subdirectory "instruments" can be found, +- default: "/usr/local/share/timidity". ++ default: "/usr/share/timidity". + + MMABC_NO_RANDOM_PICK when not set and the abc file contains multiple songs + (X:n) the first song to be played will be picked at random another click +--- libmodplug-0.8.4/src/load_pat.cpp~ 2006-09-12 02:57:25.000000000 +0300 ++++ libmodplug-0.8.4/src/load_pat.cpp 2007-04-04 20:40:13.000000000 +0300 +@@ -53,8 +53,8 @@ + #define PATHFORPAT "C:\\TIMIDITY\\INSTRUMENTS" + #else + #define DIRDELIM '/' +-#define TIMIDITYCFG "/usr/local/share/timidity/timidity.cfg" +-#define PATHFORPAT "/usr/local/share/timidity/instruments" ++#define TIMIDITYCFG "/etc/timidity.cfg" ++#define PATHFORPAT "/usr/share/timidity/instruments" + #endif + + #define PAT_ENV_PATH2CFG "MMPAT_PATH_TO_CFG" diff --git a/libmodplug.spec b/libmodplug.spec index b2098d3..8d6fb3b 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,14 +1,14 @@ Name: libmodplug -Version: 0.8 -Release: 3%{?dist} +Version: 0.8.4 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ -Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-0.8-CVE-2006-4192.patch +Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz +Patch0: %{name}-0.8.4-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 +- 0.8.4. + * Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 - Apply patch for CVE-2006-4192 (from Debian). diff --git a/sources b/sources index a9ff753..dcdf5c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz +091bd1168a524a4f36fc61f95209e7e4 libmodplug-0.8.4.tar.gz From ff5d0de28af31c60cdc95486f212ecdfeea075ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 21 Aug 2007 15:28:35 +0000 Subject: [PATCH 17/67] - Rebuild. --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 8d6fb3b..ede4cdd 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 +- Rebuild. + * Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 - 0.8.4. From 777d6cec327178670820d0450ee7ecc91a402077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 9 Feb 2008 19:23:53 +0000 Subject: [PATCH 18/67] - Rebuild. --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index ede4cdd..92fc10b 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 +- Rebuild. + * Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 - Rebuild. From d624d8034b9d3419faca7dc6e5e3a3b4c1be89b7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 16:20:56 +0000 Subject: [PATCH 19/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 92fc10b..f3d2aed 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1:0.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 - Rebuild. From 597c06947159ecbe09fe96449723cbe01105cfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 14 Apr 2009 11:47:54 +0000 Subject: [PATCH 20/67] - Update to 0.8.5, should fix #483146. --- .cvsignore | 2 +- libmodplug.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f7a2daa..bd84a36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.8.4.tar.gz +libmodplug-0.8.5.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index f3d2aed..7eaf135 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.4 -Release: 4%{?dist} +Version: 0.8.5 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 +- Update to 0.8.5, should fix #483146. + * Wed Feb 25 2009 Fedora Release Engineering - 1:0.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index dcdf5c9..c523e28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -091bd1168a524a4f36fc61f95209e7e4 libmodplug-0.8.4.tar.gz +f4143aaebe6163fa359d6a6f848296da libmodplug-0.8.5.tar.gz From 0d846ba439675683ad3e078228a762edf904637b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 27 Apr 2009 18:09:51 +0000 Subject: [PATCH 21/67] - Update to 0.8.7 (security, #496834). --- .cvsignore | 2 +- libmodplug.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index bd84a36..0e036af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.8.5.tar.gz +libmodplug-0.8.7.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index 7eaf135..01285ac 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,5 +1,5 @@ Name: libmodplug -Version: 0.8.5 +Version: 0.8.7 Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -27,8 +27,7 @@ Requires: pkgconfig %prep %setup -q %patch0 -p1 -chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h -sed -i -e 's/\r//g' ChangeLog +chmod -c -x src/tables.h %build @@ -68,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 27 2009 Ville Skyttä - 1:0.8.7-1 +- Update to 0.8.7 (security, #496834). + * Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 - Update to 0.8.5, should fix #483146. diff --git a/sources b/sources index c523e28..92aa587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4143aaebe6163fa359d6a6f848296da libmodplug-0.8.5.tar.gz +d2d9ccd8da22412999caed076140f786 libmodplug-0.8.7.tar.gz From 8c3923673daf9c6207b8205cfa3b01d1e92b85de Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 06:07:29 +0000 Subject: [PATCH 22/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 01285ac..0fe3343 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.8.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Apr 27 2009 Ville Skyttä - 1:0.8.7-1 - Update to 0.8.7 (security, #496834). From d319327771a30faa845c0e1f4af3371fcec04d4e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:04 +0000 Subject: [PATCH 23/67] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8643ffd..d9bbe73 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libmodplug -# $Id: Makefile,v 1.1 2004/11/08 04:45:29 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 04:25:00 gafton Exp $ NAME := libmodplug SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fecaa7dbf5c67aa302ca3886ae6c8415e3e039ab Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:50:24 +0000 Subject: [PATCH 24/67] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8643ffd..d9bbe73 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libmodplug -# $Id: Makefile,v 1.1 2004/11/08 04:45:29 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 04:25:00 gafton Exp $ NAME := libmodplug SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9ec2846710c60e76607192c68820141bc70c4f9c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:56:46 +0000 Subject: [PATCH 25/67] Initialize branch EL-6 for libmodplug --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 437b1072e69c8b7640c6411c8b68300ea616e67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 31 May 2010 21:15:18 +0000 Subject: [PATCH 26/67] - Update to 0.8.8.1 (#580021). - Drop explicit pkgconfig dependency from -devel (autodetected in F-12+). --- .cvsignore | 2 +- libmodplug.spec | 36 ++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e036af..bcd1b0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.8.7.tar.gz +libmodplug-0.8.8.1.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index 0fe3343..127f124 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.7 -Release: 2%{?dist} +Version: 0.8.8.1 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -18,7 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: Development files for the Modplug mod music file format library Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig %description devel %{summary}. @@ -28,10 +27,11 @@ Requires: pkgconfig %setup -q %patch0 -p1 chmod -c -x src/tables.h +sed -i -e 's/\r//g' ChangeLog %build -%configure --disable-dependency-tracking +%configure make %{?_smp_mflags} @@ -67,49 +67,53 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 7 2010 Ville Skyttä - 1:0.8.8-1 +- Update to 0.8.8.1 (#580021). +- Drop explicit pkgconfig dependency from -devel (autodetected in F-12+). + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.8.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Apr 27 2009 Ville Skyttä - 1:0.8.7-1 - Update to 0.8.7 (security, #496834). -* Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 +* Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 - Update to 0.8.5, should fix #483146. * Wed Feb 25 2009 Fedora Release Engineering - 1:0.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 +* Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 - Rebuild. -* Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 +* Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 - Rebuild. -* Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 +* Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 - 0.8.4. -* Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 +* Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 - Apply patch for CVE-2006-4192 (from Debian). -* Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 +* Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 - Rebuild. -* Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 +* Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 - 0.8, 64bit patch included upstream. -* Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 +* Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 - Rebuild, cosmetics. -* Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 - Don't ship static libs. -* Tue Aug 23 2005 Ville Skyttä - 1:0.7-3 +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-3 - Fix x86_64, thanks to Adam Goode (#166127). -* Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 +* Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 - Build with dependency tracking disabled. - Run tests in the %%check section. -* Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 +* Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 - First build, separated from xmms-modplug. - Bump Epoch. diff --git a/sources b/sources index 92aa587..93c35ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2d9ccd8da22412999caed076140f786 libmodplug-0.8.7.tar.gz +f7fa53a60c650024ff51cca88341776b libmodplug-0.8.8.1.tar.gz From 8a8924e25b2fca59bb37406dd46e3b843243a516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 20 Jun 2010 22:06:23 +0000 Subject: [PATCH 27/67] - Make -devel main package dependency ISA qualified. --- libmodplug.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index 127f124..da599f2 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for the Modplug mod music file format library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. @@ -67,7 +67,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Apr 7 2010 Ville Skyttä - 1:0.8.8-1 +* Mon Jun 21 2010 Ville Skyttä - 1:0.8.8.1-2 +- Make -devel main package dependency ISA qualified. + +* Wed Apr 7 2010 Ville Skyttä - 1:0.8.8.1-1 - Update to 0.8.8.1 (#580021). - Drop explicit pkgconfig dependency from -devel (autodetected in F-12+). From 35f3baefef91a7cfa6b06b70e90df164fa4114c0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 17:16:27 +0000 Subject: [PATCH 28/67] sync w/devel branch for 0.8.8.1 goodness --- .cvsignore | 2 +- libmodplug.spec | 39 +++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e036af..bcd1b0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmodplug-0.8.7.tar.gz +libmodplug-0.8.8.1.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index 0fe3343..da599f2 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,5 +1,5 @@ Name: libmodplug -Version: 0.8.7 +Version: 0.8.8.1 Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -17,8 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel Summary: Development files for the Modplug mod music file format library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. @@ -28,10 +27,11 @@ Requires: pkgconfig %setup -q %patch0 -p1 chmod -c -x src/tables.h +sed -i -e 's/\r//g' ChangeLog %build -%configure --disable-dependency-tracking +%configure make %{?_smp_mflags} @@ -67,49 +67,56 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 21 2010 Ville Skyttä - 1:0.8.8.1-2 +- Make -devel main package dependency ISA qualified. + +* Wed Apr 7 2010 Ville Skyttä - 1:0.8.8.1-1 +- Update to 0.8.8.1 (#580021). +- Drop explicit pkgconfig dependency from -devel (autodetected in F-12+). + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.8.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Apr 27 2009 Ville Skyttä - 1:0.8.7-1 - Update to 0.8.7 (security, #496834). -* Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 +* Tue Apr 14 2009 Ville Skyttä - 1:0.8.5-1 - Update to 0.8.5, should fix #483146. * Wed Feb 25 2009 Fedora Release Engineering - 1:0.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 +* Sat Feb 9 2008 Ville Skyttä - 1:0.8.4-3 - Rebuild. -* Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 +* Tue Aug 21 2007 Ville Skyttä - 1:0.8.4-2 - Rebuild. -* Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 +* Wed Apr 4 2007 Ville Skyttä - 1:0.8.4-1 - 0.8.4. -* Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 +* Tue Oct 3 2006 Ville Skyttä - 1:0.8-3 - Apply patch for CVE-2006-4192 (from Debian). -* Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 +* Mon Aug 28 2006 Ville Skyttä - 1:0.8-2 - Rebuild. -* Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 +* Fri Mar 24 2006 Ville Skyttä - 1:0.8-1 - 0.8, 64bit patch included upstream. -* Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 +* Mon Feb 13 2006 Ville Skyttä - 1:0.7-5 - Rebuild, cosmetics. -* Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-4 - Don't ship static libs. -* Tue Aug 23 2005 Ville Skyttä - 1:0.7-3 +* Tue Aug 23 2005 Ville Skyttä - 1:0.7-3 - Fix x86_64, thanks to Adam Goode (#166127). -* Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 +* Thu Mar 17 2005 Ville Skyttä - 1:0.7-2 - Build with dependency tracking disabled. - Run tests in the %%check section. -* Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 +* Fri Oct 17 2003 Ville Skyttä - 1:0.7-0.fdr.1 - First build, separated from xmms-modplug. - Bump Epoch. diff --git a/sources b/sources index 92aa587..93c35ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2d9ccd8da22412999caed076140f786 libmodplug-0.8.7.tar.gz +f7fa53a60c650024ff51cca88341776b libmodplug-0.8.8.1.tar.gz From ab146754272421d48cefb12d3119a3c6f022f9f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:18:04 +0000 Subject: [PATCH 29/67] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d9bbe73..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libmodplug -# $Id: Makefile,v 1.2 2004/11/24 04:25:00 gafton Exp $ -NAME := libmodplug -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 8658ce45c37b5bde5b56b6da39299262347bc3f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:18:07 +0000 Subject: [PATCH 30/67] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d9bbe73..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libmodplug -# $Id: Makefile,v 1.2 2004/11/24 04:25:00 gafton Exp $ -NAME := libmodplug -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From a94706c7262dd7b266e1df3608ea65367c8eb50d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:18:35 -0600 Subject: [PATCH 31/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index da599f2..c832a07 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1:0.8.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jun 21 2010 Ville Skyttä - 1:0.8.8.1-2 - Make -devel main package dependency ISA qualified. From 69d5fab841604998ab57b7c84b8a0834adf60df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 2 Apr 2011 16:06:48 +0300 Subject: [PATCH 32/67] Update to 0.8.8.2. --- .gitignore | 2 +- libmodplug.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bcd1b0b..ee01e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libmodplug-0.8.8.1.tar.gz +/libmodplug-0.8.8.2.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index c832a07..04924c0 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.8.1 -Release: 3%{?dist} +Version: 0.8.8.2 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -32,7 +32,7 @@ sed -i -e 's/\r//g' ChangeLog %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 2 2011 Ville Skyttä - 1:0.8.8.2-1 +- Update to 0.8.8.2. + * Tue Feb 08 2011 Fedora Release Engineering - 1:0.8.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 93c35ef..428f589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7fa53a60c650024ff51cca88341776b libmodplug-0.8.8.1.tar.gz +e1fceac4c3bc26ebe96f619b46d26ff7 libmodplug-0.8.8.2.tar.gz From f6daf35e79f7f90adbcc4b9ab9e72fc7992af0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 8 May 2011 22:08:15 +0300 Subject: [PATCH 33/67] Update to 0.8.8.3 (security, CVE-2011-1761). Require /etc/timidity.cfg for ABC and MIDI. --- .gitignore | 2 +- libmodplug.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ee01e2b..76848e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libmodplug-0.8.8.2.tar.gz +/libmodplug-0.8.8.3.tar.gz diff --git a/libmodplug.spec b/libmodplug.spec index 04924c0..ebbb663 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,5 +1,5 @@ Name: libmodplug -Version: 0.8.8.2 +Version: 0.8.8.3 Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,9 +8,12 @@ Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz +# Fedora specific, no need to send upstream Patch0: %{name}-0.8.4-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: /etc/timidity.cfg + %description %{summary}. @@ -67,8 +70,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 8 2011 Ville Skyttä - 1:0.8.8.3-1 +- Update to 0.8.8.3 (security, CVE-2011-1761). +- Require /etc/timidity.cfg for ABC and MIDI. + * Sat Apr 2 2011 Ville Skyttä - 1:0.8.8.2-1 -- Update to 0.8.8.2. +- Update to 0.8.8.2 (security, CVE-2011-1574). * Tue Feb 08 2011 Fedora Release Engineering - 1:0.8.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 428f589..43d955d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1fceac4c3bc26ebe96f619b46d26ff7 libmodplug-0.8.8.2.tar.gz +8a9c713f0f56894163ddc61f9a0d1f71 libmodplug-0.8.8.3.tar.gz From 77ade8cf92209547c6156af8ae2f6aa80eebf731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 9 May 2011 23:37:23 +0300 Subject: [PATCH 34/67] Don't require /etc/timidity.cfg on EL-6, there is no suitable provider package available in it at the moment. --- libmodplug.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index ebbb663..e328be8 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -12,7 +12,10 @@ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version} Patch0: %{name}-0.8.4-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if ! 0%{?el6} +# No package providing suitable timidity.cfg+patches in EL-6 as of 2011-05-09 Requires: /etc/timidity.cfg +%endif %description %{summary}. @@ -70,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 9 2011 Ville Skyttä - 1:0.8.8.3-2 +- Don't require /etc/timidity.cfg on EL-6, there is no suitable provider + package available in it at the moment. + * Sun May 8 2011 Ville Skyttä - 1:0.8.8.3-1 - Update to 0.8.8.3 (security, CVE-2011-1761). - Require /etc/timidity.cfg for ABC and MIDI. From 4976d06326e782f962f325cf219979467a18430d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 11 May 2011 23:39:58 +0300 Subject: [PATCH 35/67] Drop dependency on /etc/timidity.cfg, it's not worth the 100MB+ it pulls in. --- libmodplug.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index e328be8..15c9acc 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -12,11 +12,6 @@ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version} Patch0: %{name}-0.8.4-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if ! 0%{?el6} -# No package providing suitable timidity.cfg+patches in EL-6 as of 2011-05-09 -Requires: /etc/timidity.cfg -%endif - %description %{summary}. @@ -73,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 10 2011 Ville Skyttä - 1:0.8.8.3-3 +- Drop dependency on /etc/timidity.cfg, it's not worth the 100MB+ it pulls in. + * Mon May 9 2011 Ville Skyttä - 1:0.8.8.3-2 - Don't require /etc/timidity.cfg on EL-6, there is no suitable provider package available in it at the moment. From fb7a2acddc5217946726e81cc92de19670bb56dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 7 Aug 2011 11:10:34 +0300 Subject: [PATCH 36/67] Update to 0.8.8.4 (security, #728371). --- .gitignore | 2 +- libmodplug.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 76848e6..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libmodplug-0.8.8.3.tar.gz +/*.tar.* diff --git a/libmodplug.spec b/libmodplug.spec index 15c9acc..9f2fedb 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.8.3 -Release: 3%{?dist} +Version: 0.8.8.4 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -27,7 +27,6 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %prep %setup -q %patch0 -p1 -chmod -c -x src/tables.h sed -i -e 's/\r//g' ChangeLog @@ -68,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 7 2011 Ville Skyttä - 1:0.8.8.4-1 +- Update to 0.8.8.4 (security, #728371). + * Tue May 10 2011 Ville Skyttä - 1:0.8.8.3-3 - Drop dependency on /etc/timidity.cfg, it's not worth the 100MB+ it pulls in. diff --git a/sources b/sources index 43d955d..9f2a853 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a9c713f0f56894163ddc61f9a0d1f71 libmodplug-0.8.8.3.tar.gz +fddc3c704c5489de2a3cf0fedfec59db libmodplug-0.8.8.4.tar.gz From 0dc02d5ccc829ca8a5a12b4a56bb08369401564b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:03:37 -0600 Subject: [PATCH 37/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 9f2fedb..a4b7363 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1:0.8.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Aug 7 2011 Ville Skyttä - 1:0.8.8.4-1 - Update to 0.8.8.4 (security, #728371). From 65ce457cce35f340904d7f3a1b7f5b5f53adc225 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 15:28:41 -0500 Subject: [PATCH 38/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index a4b7363..fabec04 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1:0.8.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1:0.8.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c89611917e942fa9428c9341b06940944eed7ff8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:45:25 -0600 Subject: [PATCH 39/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index fabec04..7b95b50 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1:0.8.8.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 1:0.8.8.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 697ebc94a094908c7ff28bce515f77503532ef64 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 01:13:44 -0500 Subject: [PATCH 40/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 7b95b50..f26e345 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1:0.8.8.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 1:0.8.8.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 59e63e0b3676492f2e0b54954e3450a759dcc33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 11 Mar 2014 17:23:17 +0200 Subject: [PATCH 41/67] Update to 0.8.8.5 (CVE-2013-4233, CVE-2013-4234, #995580). --- libmodplug.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index f26e345..4ef0e68 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.8.4 -Release: 5%{?dist} +Version: 0.8.8.5 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 10 2014 Ville Skyttä - 1:0.8.8.5-1 +- Update to 0.8.8.5 (CVE-2013-4233, CVE-2013-4234, #995580). + * Sat Aug 03 2013 Fedora Release Engineering - 1:0.8.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 9f2a853..b9f42d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fddc3c704c5489de2a3cf0fedfec59db libmodplug-0.8.8.4.tar.gz +5f30241db109d647781b784e62ddfaa1 libmodplug-0.8.8.5.tar.gz From d252f336350e428b9f9eae236b426eab2358a6e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 23:27:01 -0500 Subject: [PATCH 42/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 4ef0e68..f45097d 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1:0.8.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Mar 10 2014 Ville Skyttä - 1:0.8.8.5-1 - Update to 0.8.8.5 (CVE-2013-4233, CVE-2013-4234, #995580). From 4c21d5ea6be37b3375a03a4c91e1a5bf6b92b5b6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 04:38:11 +0000 Subject: [PATCH 43/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index f45097d..f8d520c 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1:0.8.8.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1:0.8.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From bb75e35143cc461541feaec93c6c2fefa9153f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 28 Jan 2015 22:57:07 +0200 Subject: [PATCH 44/67] Ship COPYING as %license where available --- libmodplug.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index f8d520c..61af6e1 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -56,7 +56,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS ChangeLog README TODO %{_libdir}/libmodplug.so.* %files devel @@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 28 2015 Ville Skyttä - 1:0.8.8.5-4 +- Ship COPYING as %%license where available + * Sun Aug 17 2014 Fedora Release Engineering - 1:0.8.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b4199f9be5dc6e6d083ade120e2229cdf9cec07d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 15:23:25 +0200 Subject: [PATCH 45/67] Rebuilt for GCC 5 C++11 ABI change --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 61af6e1..725f149 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2015 Kalev Lember - 1:0.8.8.5-5 +- Rebuilt for GCC 5 C++11 ABI change + * Wed Jan 28 2015 Ville Skyttä - 1:0.8.8.5-4 - Ship COPYING as %%license where available From 030854dd1428001bdf794d136d64d24fb2c69886 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 16:06:56 +0000 Subject: [PATCH 46/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 725f149..407b109 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1:0.8.8.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1:0.8.8.5-5 - Rebuilt for GCC 5 C++11 ABI change From 5ccd7fc82f51d692230e53027028a34964cee5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jan 2016 12:46:55 +0200 Subject: [PATCH 47/67] Suggest timidity where available --- libmodplug.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libmodplug.spec b/libmodplug.spec index 407b109..d1f0d8b 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -12,6 +12,10 @@ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version} Patch0: %{name}-0.8.4-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?fedora} || 0%{?rhel} > 7 +Suggests: %{_sysconfdir}/timidity.cfg +%endif + %description %{summary}. @@ -69,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 26 2016 Ville Skyttä +- Suggest timidity where available + * Wed Jun 17 2015 Fedora Release Engineering - 1:0.8.8.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 99dd6eb6f6c5b1f125757bccb475a43f4d24b7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 26 Jan 2016 12:47:54 +0200 Subject: [PATCH 48/67] Remove unnecessary %defattr - Suggest timidity where available --- libmodplug.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index d1f0d8b..cb5ec19 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -59,21 +59,20 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS ChangeLog README TODO %{_libdir}/libmodplug.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/libmodplug/ %{_libdir}/libmodplug.so %{_libdir}/pkgconfig/libmodplug.pc %changelog -* Tue Jan 26 2016 Ville Skyttä +* Tue Jan 26 2016 Ville Skyttä - 1:0.8.8.5-7 +- Remove unnecessary %%defattr - Suggest timidity where available * Wed Jun 17 2015 Fedora Release Engineering - 1:0.8.8.5-6 From 8919da62b8db6e8b3df6c56975344c1ef5999f3c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:33:03 +0000 Subject: [PATCH 49/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index cb5ec19..13e78e0 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1:0.8.8.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 26 2016 Ville Skyttä - 1:0.8.8.5-7 - Remove unnecessary %%defattr - Suggest timidity where available From 50b40b3e55f5e905371c81ec6576d1408a35abdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:04:15 +0000 Subject: [PATCH 50/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 13e78e0..b0de656 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.8.5 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1:0.8.8.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1:0.8.8.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1cd361b03faad5d4edb4a76c57065b9280c00673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 25 Apr 2017 17:35:50 +0300 Subject: [PATCH 51/67] Update to 0.8.9.0 --- ...h => libmodplug-0.8.9.0-timiditypaths.patch | 18 ++++++++++-------- libmodplug.spec | 10 ++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) rename libmodplug-0.8.4-timiditypaths.patch => libmodplug-0.8.9.0-timiditypaths.patch (68%) diff --git a/libmodplug-0.8.4-timiditypaths.patch b/libmodplug-0.8.9.0-timiditypaths.patch similarity index 68% rename from libmodplug-0.8.4-timiditypaths.patch rename to libmodplug-0.8.9.0-timiditypaths.patch index 9fbdbba..8bc93a3 100644 --- a/libmodplug-0.8.4-timiditypaths.patch +++ b/libmodplug-0.8.9.0-timiditypaths.patch @@ -1,6 +1,7 @@ ---- libmodplug-0.8.4/README~ 2006-11-02 05:26:30.000000000 +0200 -+++ libmodplug-0.8.4/README 2007-04-04 20:39:53.000000000 +0300 -@@ -57,7 +57,7 @@ +diff -up libmodplug-0.8.9.0/README~ libmodplug-0.8.9.0/README +--- libmodplug-0.8.9.0/README~ 2017-04-24 16:16:28.000000000 +0300 ++++ libmodplug-0.8.9.0/README 2017-04-25 10:13:08.701929258 +0300 +@@ -71,7 +71,7 @@ Contents MMPAT_PATH_TO_CFG set to the directory where the file "timidity.cfg" and the subdirectory "instruments" can be found, @@ -9,7 +10,7 @@ MMMID_SPEED for experimenting with the mod speed (1 thru 9) MMMID_VERBOSE for feedback on the conversion process MMMID_DEBUG for sake of completeness, only useful for maintainers -@@ -68,7 +68,7 @@ +@@ -82,7 +82,7 @@ Contents MMPAT_PATH_TO_CFG set to the directory where the file "timidity.cfg" and the subdirectory "instruments" can be found, @@ -17,10 +18,11 @@ + default: "/usr/share/timidity". MMABC_NO_RANDOM_PICK when not set and the abc file contains multiple songs - (X:n) the first song to be played will be picked at random another click ---- libmodplug-0.8.4/src/load_pat.cpp~ 2006-09-12 02:57:25.000000000 +0300 -+++ libmodplug-0.8.4/src/load_pat.cpp 2007-04-04 20:40:13.000000000 +0300 -@@ -53,8 +53,8 @@ + (X:n) the first song to be played will be picked at random another click +diff -up libmodplug-0.8.9.0/src/load_pat.cpp~ libmodplug-0.8.9.0/src/load_pat.cpp +--- libmodplug-0.8.9.0/src/load_pat.cpp~ 2017-04-24 16:10:17.000000000 +0300 ++++ libmodplug-0.8.9.0/src/load_pat.cpp 2017-04-25 10:13:08.701929258 +0300 +@@ -52,8 +52,8 @@ #define PATHFORPAT "C:\\TIMIDITY\\INSTRUMENTS" #else #define DIRDELIM '/' diff --git a/libmodplug.spec b/libmodplug.spec index b0de656..640d5e5 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.8.8.5 -Release: 9%{?dist} +Version: 0.8.9.0 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -9,7 +9,7 @@ License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz # Fedora specific, no need to send upstream -Patch0: %{name}-0.8.4-timiditypaths.patch +Patch0: %{name}-0.8.9.0-timiditypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} || 0%{?rhel} > 7 @@ -59,7 +59,6 @@ rm -rf $RPM_BUILD_ROOT %files -%{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS ChangeLog README TODO %{_libdir}/libmodplug.so.* @@ -71,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 25 2017 Ville Skyttä - 1:0.8.9.0-1 +- Update to 0.8.9.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1:0.8.8.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index b9f42d1..da7722e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f30241db109d647781b784e62ddfaa1 libmodplug-0.8.8.5.tar.gz +SHA512 (libmodplug-0.8.9.0.tar.gz) = 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd From 90faeeadfde90f1cbe757c0b7fb5e4bf996eaa85 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 19:16:52 +0000 Subject: [PATCH 52/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 640d5e5..5cf1c75 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1:0.8.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Apr 25 2017 Ville Skyttä - 1:0.8.9.0-1 - Update to 0.8.9.0 From 006a81a2290e0bc6f5e2bb1347ad18d785db4323 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:52:00 +0000 Subject: [PATCH 53/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 5cf1c75..fa33f27 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1:0.8.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1:0.8.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 16e6874c8b61d705504a1a17f136f470aa03e8dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 22:42:50 +0000 Subject: [PATCH 54/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index fa33f27..5d367ca 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1:0.8.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1:0.8.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 4de335d1150c2cee111c7b9b47da34dca0ce8a92 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:40:48 +0100 Subject: [PATCH 55/67] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- libmodplug.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 5d367ca..e069163 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -10,7 +10,6 @@ URL: http://modplug-xmms.sourceforge.net/ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz # Fedora specific, no need to send upstream Patch0: %{name}-0.8.9.0-timiditypaths.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} || 0%{?rhel} > 7 Suggests: %{_sysconfdir}/timidity.cfg From 2caf762374ba7d455cbd104e4bfb3ba24ab94859 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:14:08 +0100 Subject: [PATCH 56/67] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libmodplug.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index e069163..101dd14 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -48,9 +48,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la make check -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig From f7a22ee8374fd336b59ad3d8bf65552dafbc229d Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 17 Feb 2018 14:49:36 +0100 Subject: [PATCH 57/67] Use %%ldconfig_scriptlets --- libmodplug.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index 101dd14..b5c8799 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -26,33 +26,23 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel %{summary}. - %prep %setup -q %patch0 -p1 sed -i -e 's/\r//g' ChangeLog - %build %configure -make %{?_smp_mflags} V=1 - +%make_build V=1 %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - %check make check - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - +%ldconfig_scriptlets %files %license COPYING @@ -64,8 +54,10 @@ make check %{_libdir}/libmodplug.so %{_libdir}/pkgconfig/libmodplug.pc - %changelog +* Sat Feb 17 2018 Antonio Trande - 1:0.8.9.0-5 +- Use %%ldconfig_scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 1:0.8.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7c9ea9ab48f1247988d2dfe695b9e7b36c4f76aa Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 22 Feb 2018 19:11:46 +0100 Subject: [PATCH 58/67] Add gcc gcc-c++ BR --- libmodplug.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libmodplug.spec b/libmodplug.spec index b5c8799..3270b33 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,16 +1,16 @@ Name: libmodplug Version: 0.8.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Modplug mod music file format library - -Group: System Environment/Libraries License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz # Fedora specific, no need to send upstream Patch0: %{name}-0.8.9.0-timiditypaths.patch +BuildRequires: gcc, gcc-c++ + %if 0%{?fedora} || 0%{?rhel} > 7 Suggests: %{_sysconfdir}/timidity.cfg %endif @@ -20,8 +20,8 @@ Suggests: %{_sysconfdir}/timidity.cfg %package devel Summary: Development files for the Modplug mod music file format library -Group: Development/Libraries Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: gcc-c++ %description devel %{summary}. @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Thu Feb 22 2018 Antonio Trande - 1:0.8.9.0-6 +- Add gcc gcc-c++ BR + * Sat Feb 17 2018 Antonio Trande - 1:0.8.9.0-5 - Use %%ldconfig_scriptlets From 2f3898283fe3ca415587abfd2be3e826a525e625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:27:06 +0000 Subject: [PATCH 59/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 3270b33..d239a06 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1:0.8.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 22 2018 Antonio Trande - 1:0.8.9.0-6 - Add gcc gcc-c++ BR From b5969decb54c1d798f3807009dd258ebb73bcafb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:39:46 +0000 Subject: [PATCH 60/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index d239a06..c92a383 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1:0.8.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1:0.8.9.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e8a96c0cbdfcfbccf62a3a0456530745b6302f7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:48:43 +0000 Subject: [PATCH 61/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index c92a383..4447c67 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1:0.8.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1:0.8.9.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f41ab08da2fb616c0eb94b3ac217eef3ce67cebe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:44:56 +0000 Subject: [PATCH 62/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 4447c67..b376e32 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1:0.8.9.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1:0.8.9.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1745b205fc8cc79676a078d2b7588f33d8f04320 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:06:46 +0000 Subject: [PATCH 63/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index b376e32..608a80e 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -55,6 +55,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1:0.8.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1:0.8.9.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 33330d1aa08f3da6e8e64d3bb0030f7927bd2c32 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:15:07 +0000 Subject: [PATCH 64/67] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libmodplug.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libmodplug.spec b/libmodplug.spec index 608a80e..e8bc23f 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/modplug-xmms/%{name}-%{version} Patch0: %{name}-0.8.9.0-timiditypaths.patch BuildRequires: gcc, gcc-c++ +BuildRequires: make %if 0%{?fedora} || 0%{?rhel} > 7 Suggests: %{_sysconfdir}/timidity.cfg From b286d686e2e970db23f3cfac95662fd28fb81750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:31:43 +0000 Subject: [PATCH 65/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index e8bc23f..5f05251 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -56,6 +56,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:0.8.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1:0.8.9.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 04701d25c29ec852d42e1da6464a3e8404ac5b99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:51:37 +0000 Subject: [PATCH 66/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libmodplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmodplug.spec b/libmodplug.spec index 5f05251..68feaac 100644 --- a/libmodplug.spec +++ b/libmodplug.spec @@ -1,6 +1,6 @@ Name: libmodplug Version: 0.8.9.0 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: Modplug mod music file format library License: Public Domain @@ -56,6 +56,9 @@ make check %{_libdir}/pkgconfig/libmodplug.pc %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:0.8.9.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1:0.8.9.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 565876ae474d753cf763076ffab2ecf15bd00ca7 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:11:36 +0300 Subject: [PATCH 67/67] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index da7722e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libmodplug-0.8.9.0.tar.gz) = 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd