From d319327771a30faa845c0e1f4af3371fcec04d4e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:04 +0000 Subject: [PATCH 1/6] 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 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 2/6] - 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 3/6] - 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 ab146754272421d48cefb12d3119a3c6f022f9f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:18:04 +0000 Subject: [PATCH 4/6] 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 a94706c7262dd7b266e1df3608ea65367c8eb50d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:18:35 -0600 Subject: [PATCH 5/6] - 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 6/6] 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