[libsidplay] - Use 1.36.60 tarball with merged patches.

[Michael Schwendt]

commit db09b5abe3bc7f12455e01ea18f66040b02e0430
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Aug 20 14:05:35 2010 +0200

    - Use 1.36.60 tarball with merged patches.

 .gitignore                     |    1 +
 libsidplay-1.36.57-gcc43.patch |   19 -------------------
 libsidplay-post57fixes.patch   |   39 ---------------------------------------
 libsidplay-post59fixes.patch   |   25 -------------------------
 libsidplay.spec                |   31 +++++++++++++++++--------------
 sources                        |    2 +-
 6 files changed, 19 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c632678..ebc7843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libsidplay-1.36.57.tgz
+/libsidplay-1.36.60.tar.bz2
diff --git a/libsidplay.spec b/libsidplay.spec
index 577a386..98d05bb 100644
--- a/libsidplay.spec
+++ b/libsidplay.spec
@@ -1,12 +1,9 @@
 Name: libsidplay
 Summary: SID chip music module playing library
-Version: 1.36.57
-Release: 21%{?dist}
-Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
-Patch0: libsidplay-post57fixes.patch
-Patch1: libsidplay-post59fixes.patch
-Patch2: libsidplay-1.36.57-opts.patch
-Patch3: libsidplay-1.36.57-gcc43.patch
+Version: 1.36.60
+Release: 1%{?dist}
+Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tar.bz2
+Patch0: libsidplay-1.36.57-opts.patch
 Group: System Environment/Libraries
 URL: http://home.arcor.de/ms2002sep/bak/
 License: GPLv2+
@@ -36,42 +33,48 @@ Developers should consider switching to libsidplay version 2 or newer.
 
 %prep
 %setup -q
-%patch0 -p1 -b .post57fixes
-%patch1 -p1 -b .post59fixes
-%patch2 -p1 -b .opts
-%patch3 -p1 -b .gcc43
+%patch0 -p1 -b .opts
+
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS" %configure \
-  --disable-static
+%configure --disable-static
 make %{_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 make DESTDIR=%{buildroot} INSTALL="install -p" install
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
+
 %files devel
 %defattr(-,root,root,-)
 %doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
-#%{_libdir}/libsidplay.a
 %{_includedir}/sidplay/
 
+
 %changelog
+* Fri Aug 20 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.60-1
+- Use 1.36.60 tarball with merged patches.
+
 * Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
 - apply minor patch to avoid uninitialised values
 
diff --git a/sources b/sources
index 5d99dc3..544f973 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a935ec67d5600b079e22ecac58cc19d5  libsidplay-1.36.57.tgz
+46c5ceccd31636e3f83774dd0b3d4003  libsidplay-1.36.60.tar.bz2