rpms/libtunepimp/devel libtunepimp-0.4.0-gcc41.patch, NONE, 1.1 libtunepimp.spec, 1.3, 1.4 libtunepimp-0.3.0-gcc4.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Modified Files:
	libtunepimp.spec 
Added Files:
	libtunepimp-0.4.0-gcc41.patch 
Removed Files:
	libtunepimp-0.3.0-gcc4.patch 
Log Message:
* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-5
- update gcc4 patch


libtunepimp-0.4.0-gcc41.patch:

--- NEW FILE libtunepimp-0.4.0-gcc41.patch ---
--- libtunepimp-0.4.0/include/tunepimp/metadata.h.gcc41	2005-11-11 17:45:45.000000000 -0600
+++ libtunepimp-0.4.0/include/tunepimp/metadata.h	2005-12-19 15:32:25.000000000 -0600
@@ -59,7 +59,7 @@
     // This is only used in case of TRM collision
     int           numTRMIds;
 
-    Metadata::Metadata(void) 
+    Metadata(void) 
     { 
         trackNum = 0; 
         duration = 0; 
@@ -72,11 +72,11 @@
         totalInSet = 0;
     };
 
-    Metadata::~Metadata(void) 
+    ~Metadata(void) 
     {
     }
 
-    Metadata &Metadata::operator=(const Metadata &other)
+    Metadata &operator=(const Metadata &other)
     {
         artist = other.artist;
         sortName = other.sortName;
@@ -104,7 +104,7 @@
         return *this;
     };
 
-    bool Metadata::isEmpty(void)
+    bool isEmpty(void)
     {
         return (artist.empty() && album.empty() && track.empty() &&
             trackNum == 0 && duration == 0 && fileTrm.empty() &&
@@ -112,7 +112,7 @@
             sortName.empty() && fileFormat.empty());
     }
 
-    bool Metadata::operator==(const Metadata &other)
+    bool operator==(const Metadata &other)
     {
         if (artist == other.artist &&
             album == other.album &&
@@ -140,7 +140,7 @@
         return false;
     };
 
-    void Metadata::clear(void)
+    void clear(void)
     {
         artist = "";
         album = "";
@@ -164,7 +164,7 @@
         totalInSet = 0;
     }
 
-    void Metadata::readFromC(const metadata_t *mdata)
+    void readFromC(const metadata_t *mdata)
     {
         artist = mdata->artist;
         sortName = mdata->sortName;
@@ -190,7 +190,7 @@
         totalInSet = mdata->totalInSet;
     }
 
-    void Metadata::writeToC(metadata_t *mdata) const
+    void writeToC(metadata_t *mdata) const
     {
         memset(mdata, 0, sizeof(metadata_t));
 
@@ -218,7 +218,7 @@
         mdata->totalInSet = totalInSet;
     }
 
-    void Metadata::print(void)
+    void print(void)
     {
         printf("artist: '%s'\n", artist.c_str());
         printf("sortName: '%s'\n", sortName.c_str());


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libtunepimp.spec	19 Dec 2005 18:09:02 -0000	1.3
+++ libtunepimp.spec	19 Dec 2005 21:36:23 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp 
 Version: 0.4.0 
-Release: 4%{?dist}
+Release: 5%{?dist}
 # README.LGPL implies that it's not completely lgpl, yet.
 License: GPL
 Group: 	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libtunepimp-0.3.0-gcc4.patch
+Patch1:  libtunepimp-0.4.0-gcc41.patch
 
 BuildRequires: readline-devel
 BuildRequires: libvorbis-devel
@@ -42,7 +42,7 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .gcc4
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-5
+- update gcc4 patch
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0-4
 - -tools: fix Req: %%name dependancy
 


--- libtunepimp-0.3.0-gcc4.patch DELETED ---