[modplugtools] Update to 0.5.2; --help patch and format string (mostly) patches upstreamed.

[Ville Skyttä]

commit 3df652c7dc51733e8827e5dbcf59c846b594ca8e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 4 00:21:11 2010 +0300

    Update to 0.5.2; --help patch and format string (mostly) patches upstreamed.

 .gitignore                                         |    2 +-
 ...ng-bits-from-previous-format-string-relat.patch |   36 ++++++
 0002-Fix-format-string-related-issues.patch        |   78 ------------
 0003-Usage-message-help-h-fixes.patch              |  133 --------------------
 modplugtools.spec                                  |   12 +-
 sources                                            |    2 +-
 6 files changed, 44 insertions(+), 219 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c6303cc..9a4d063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-modplugtools-0.5.0.tar.gz
+modplugtools-0.5.2.tar.gz
diff --git a/0001-Apply-missing-bits-from-previous-format-string-relat.patch b/0001-Apply-missing-bits-from-previous-format-string-relat.patch
new file mode 100644
index 0000000..0af804a
--- /dev/null
+++ b/0001-Apply-missing-bits-from-previous-format-string-relat.patch
@@ -0,0 +1,36 @@
+From 2df8ca6367092cf491e3ef0dc710750e7d4a870d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Tue, 3 Aug 2010 23:51:38 +0300
+Subject: [PATCH] Apply missing bits from previous format string related fix.
+
+---
+ modplug-tools/mpplay/modplugplay.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modplug-tools/mpplay/modplugplay.c b/modplug-tools/mpplay/modplugplay.c
+index 7f43d22..3db804a 100644
+--- a/modplug-tools/mpplay/modplugplay.c
++++ b/modplug-tools/mpplay/modplugplay.c
+@@ -386,7 +386,7 @@ for (song=1; song<argc; song++) {
+ 
+     d = getFileData(argv[song], &size);
+     if (d == NULL) continue;
+-    printf(" [%d]\n",size);
++    printf(" [%ld]\n",size);
+ 
+     if (ioctl(audio_fd,SNDCTL_DSP_SETFMT, &format) == -1) {
+ 	perror("SND_CTL_DSP_SETFMT");
+@@ -447,8 +447,8 @@ for (song=1; song<argc; song++) {
+         strncpy(songname,st,41);
+         songname[41] = 0;
+     }
+-    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits);
+-    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits);
++    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
++    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
+ 
+     gettimeofday(&tvstart,NULL);
+     tvptotal.tv_sec=tvptotal.tv_usec=0;
+-- 
+1.7.2
+
diff --git a/modplugtools.spec b/modplugtools.spec
index d713a07..1610b4e 100644
--- a/modplugtools.spec
+++ b/modplugtools.spec
@@ -1,6 +1,6 @@
 Name:           modplugtools
-Version:        0.5.0
-Release:        2%{?dist}
+Version:        0.5.2
+Release:        1%{?dist}
 Summary:        Command line mod music players
 
 Group:          Applications/Multimedia
@@ -12,9 +12,7 @@ Patch0:         %{name}-0.5.0-libmodplug087.patch
 # Make modplugplay more likely to work out of the box (not for upstream)
 Patch1:         %{name}-0.5.0-modplugplay-aoss.patch
 # http://sf.net/tracker/?func=detail&aid=3019146&group_id=1275&atid=301275
-Patch2:         0002-Fix-format-string-related-issues.patch
-# http://sf.net/tracker/?func=detail&aid=3019148&group_id=1275&atid=301275
-Patch3:         0003-Usage-message-help-h-fixes.patch
+Patch2:         0001-Apply-missing-bits-from-previous-format-string-relat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libmodplug-devel
@@ -34,7 +32,6 @@ if ! pkg-config --atleast-version 0.8.8 libmodplug ; then
 fi
 %patch1 -p1
 %patch2 -p2
-%patch3 -p2
 
 
 %build
@@ -59,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug  3 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.5.2-1
+- Update to 0.5.2; --help patch and format string (mostly) patches upstreamed.
+
 * Mon Jun 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-2
 - Patch to fix --help related issues (#600835).
 - Patch to fix format string issues (#600835).
diff --git a/sources b/sources
index d085678..74fb00e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d41699c9a2a662f2191200ddef5678b0  modplugtools-0.5.0.tar.gz
+9d89a1e15f92133897bf073cf8380a88  modplugtools-0.5.2.tar.gz