rpms/quodlibet/F-7 quodlibet-1.0-libgpod-0.5.2.patch, NONE, 1.1 quodlibet.spec, 1.9, 1.10

[Todd M. Zullinger (tmz)]

Author: tmz

Update of /cvs/extras/rpms/quodlibet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32738

Modified Files:
	quodlibet.spec 
Added Files:
	quodlibet-1.0-libgpod-0.5.2.patch 
Log Message:
* Mon Jul 09 2007 Todd Zullinger <tmz at pobox.com> - 1.0-2
- Small fix for changes in python-gpod-0.5.2
- Fix some desktop-file-install warning and errors


quodlibet-1.0-libgpod-0.5.2.patch:

--- NEW FILE quodlibet-1.0-libgpod-0.5.2.patch ---
--- quodlibet-1.0/devices/ipod.py.libgpod-0.5.2	2007-04-29 23:49:58.000000000 -0400
+++ quodlibet-1.0/devices/ipod.py	2007-07-05 01:32:23.000000000 -0400
@@ -300,8 +300,11 @@ class IPodDevice(Device):
 
     def __mactime(self, time):
         time = int(time)
-        if time == 0: return time
-        else: return time + 2082844800
+        # time handling changed in libgpod 0.5.x
+        try: return gpod.itdb_time_host_to_mac(time)
+        except TypeError:
+            if time == 0: return time
+            else: return time + 2082844800
 
     # Convert ReplayGain values to Apple Soundcheck values
     def __soundcheck(self, song):


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/F-7/quodlibet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- quodlibet.spec	10 May 2007 17:56:12 -0000	1.9
+++ quodlibet.spec	20 Dec 2007 02:49:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           quodlibet
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A music management program
 
 Group:          Applications/Multimedia
@@ -14,6 +14,7 @@
 Source3:        google.py
 
 Source4:        README.fedora
+Patch0:         quodlibet-1.0-libgpod-0.5.2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libgpod-0.5.2
 cp %{S:4} .
 
 %build
@@ -98,12 +100,16 @@
 
 rm -f %{buildroot}%{_datadir}/applications/*.desktop
 make exfalso.desktop quodlibet.desktop
+sed -i 's/;GTK$/&;/' *.desktop
+sed -i 's/AudioPlayer/Player/' quodlibet.desktop
 desktop-file-install --vendor fedora                            \
         --dir %{buildroot}%{_datadir}/applications              \
+        --remove-category Application                           \
         --add-category X-Fedora                                 \
         exfalso.desktop
 desktop-file-install --vendor fedora                            \
         --dir %{buildroot}%{_datadir}/applications              \
+        --remove-category Application                           \
         --add-category X-Fedora                                 \
         quodlibet.desktop
 
@@ -134,6 +140,10 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Mon Jul 09 2007 Todd Zullinger <tmz at pobox.com> - 1.0-2
+- Small fix for changes in python-gpod-0.5.2
+- Fix some desktop-file-install warning and errors
+
 * Thu May 10 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.0-1
 - Update to 1.0