rpms/libsidplay/F-12 libsidplay-post59fixes.patch, NONE, 1.1 libsidplay.spec, 1.26, 1.27

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/libsidplay/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1288/F-12

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-post59fixes.patch 
Log Message:
* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
- apply minor patch to avoid uninitialised values


libsidplay-post59fixes.patch:
 eeconfig.cpp |    2 +-
 sidtune.cpp  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libsidplay-post59fixes.patch ---
diff -Nur libsidplay-1.36.57-orig/src/eeconfig.cpp libsidplay-1.36.57/src/eeconfig.cpp
--- libsidplay-1.36.57-orig/src/eeconfig.cpp	2001-11-19 20:27:56.000000000 +0100
+++ libsidplay-1.36.57/src/eeconfig.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -51,8 +51,8 @@
 		initMixerEngine();
 		setDefaultVoiceVolumes();
 		setDefaultFilterStrength();
-		reset();
 		isReady = true;
+		reset();
 	}
 	else
 	{
diff -Nur libsidplay-1.36.57-orig/src/sidtune.cpp libsidplay-1.36.57/src/sidtune.cpp
--- libsidplay-1.36.57-orig/src/sidtune.cpp	2002-09-13 00:46:12.000000000 +0200
+++ libsidplay-1.36.57/src/sidtune.cpp	2009-12-17 19:42:58.000000000 +0100
@@ -529,6 +529,8 @@
 	cachePtr = 0;
 	cacheLen = 0;
 
+	isSlashedFileName = false;
+
 	fileBuf = ( fileBuf2 = 0 );
 	fileOffset = 0;
 	fileNameExtensions = defaultFileNameExt;


Index: libsidplay.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsidplay/F-12/libsidplay.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libsidplay.spec	25 Jul 2009 08:37:22 -0000	1.26
+++ libsidplay.spec	17 Dec 2009 19:04:38 -0000	1.27
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: SID chip music module playing library
 Version: 1.36.57
-Release: 20
+Release: 21%{?dist}
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
-Patch: libsidplay-post57fixes.patch
+Patch0: libsidplay-post57fixes.patch
+Patch1: libsidplay-post59fixes.patch
 Patch2: libsidplay-1.36.57-opts.patch
 Patch3: libsidplay-1.36.57-gcc43.patch
 Group: System Environment/Libraries
@@ -35,14 +36,15 @@ Developers should consider switching to 
 
 %prep
 %setup -q
-%patch -p1 -b .post57fixes
+%patch0 -p1 -b .post57fixes
+%patch1 -p1 -b .post59fixes
 %patch2 -p1 -b .opts
 %patch3 -p1 -b .gcc43
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" %configure \
   --disable-static
-make
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -57,19 +59,22 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libsidplay.so.*
 %exclude %{_libdir}/*.la
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS DEVELOPER src/*.txt
 %{_libdir}/libsidplay.so
 #%{_libdir}/libsidplay.a
-%{_includedir}/sidplay
+%{_includedir}/sidplay/
 
 %changelog
+* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.36.57-21
+- apply minor patch to avoid uninitialised values
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.36.57-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild