rpms/libgpod/F-12 libgpod-utf16-parsing.patch, 1.2, 1.3 libgpod.spec, 1.28, 1.29

[Bastien Nocera]

Author: hadess

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

Modified Files:
	libgpod-utf16-parsing.patch libgpod.spec 
Log Message:
* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
- Fix UTF-16 string parsing patch again


libgpod-utf16-parsing.patch:
 b/src/itdb_itunesdb.c             |   72 ++++++++++++++++++++++----------------
 libgpod-0.7.2/src/itdb_itunesdb.c |    1 
 2 files changed, 43 insertions(+), 30 deletions(-)

Index: libgpod-utf16-parsing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod-utf16-parsing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- libgpod-utf16-parsing.patch	19 Oct 2009 13:31:33 -0000	1.2
+++ libgpod-utf16-parsing.patch	19 Oct 2009 16:04:27 -0000	1.3
@@ -99,15 +99,13 @@ index c41e758..3f352e1 100644
        }
        break;
    case MHOD_ID_PODCASTURL:
-diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
-index fdbe898..7e411b5 100644
---- a/src/itdb_itunesdb.c
-+++ b/src/itdb_itunesdb.c
- -1427,6 +1427,7 @@ static MHODData get_mhod (FImport *fimp, glong mhod_seek, 
+--- libgpod-0.7.2/src/itdb_itunesdb.c.old	2009-10-19 16:53:13.000000000 +0100
++++ libgpod-0.7.2/src/itdb_itunesdb.c	2009-10-19 16:53:57.000000000 +0100
+@@ -1423,6 +1423,7 @@ static MHODData get_mhod (FImport *fimp,
    case MHOD_ID_SORT_TVSHOW:
        result.data.string = extract_mhod_string (cts, seek);
        if (result.data.string == NULL) {
-+         *ml = mhod_len;
-          return result;
++	  *ml = mhod_len;
+ 	  return result;
        }
        break;


Index: libgpod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgpod/F-12/libgpod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libgpod.spec	19 Oct 2009 13:31:33 -0000	1.28
+++ libgpod.spec	19 Oct 2009 16:04:27 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -141,6 +141,9 @@ libgpod library.
 
 
 %changelog
+* Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-5
+- Fix UTF-16 string parsing patch again
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.7.2-4
 - Update UTF-16 string parsing patch