From 35f3baefef91a7cfa6b06b70e90df164fa4114c0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 17:16:27 +0000 Subject: [PATCH] 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