[exaile/f16] Update to 3.3.0

Mon Sep 24 22:12:47 UTC 2012

commit 9e417435507b5d6eae9de966a36d853f5971b885
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Mon Sep 24 18:12:45 2012 -0400

    Update to 3.3.0

 exaile-3.3.0-makefile.patch                      |   31 +++++++++++++++++++
 exaile-udisks.patch => exaile-3.3.0-udisks.patch |   36 ++--------------------
 exaile-makefile.patch                            |   22 -------------
 exaile.spec                                      |   21 +++++++-----
 sources                                          |    2 +-
 5 files changed, 47 insertions(+), 65 deletions(-)
---

diff --git a/exaile-3.3.0-makefile.patch b/exaile-3.3.0-makefile.patch
new file mode 100644
index 0000000..2f21c18
--- /dev/null
+++ b/exaile-3.3.0-makefile.patch
@@ -0,0 +1,31 @@
+--- Makefile	2012-08-30 17:58:21.000000000 -0400
++++ Makefile.new	2012-09-24 15:52:38.751091930 -0400
+@@ -5,7 +5,7 @@
+ XDGCONFDIR 	?= /etc/xdg
+ 
+ EXAILEBINDIR  = ${DESTDIR}${PREFIX}/bin
+-EXAILELIBDIR 	= ${DESTDIR}${PREFIX}${LIBINSTALLDIR}/exaile
++EXAILELIBDIR 	= ${DESTDIR}${LIBINSTALLDIR}/exaile
+ EXAILESHAREDIR 	= ${DESTDIR}${PREFIX}/share/exaile
+ EXAILECONFDIR 	= ${DESTDIR}${XDGCONFDIR}/exaile
+ 
+@@ -120,7 +120,7 @@
+ 	tools/generate-launcher "${DESTDIR}" "${PREFIX}" "${LIBINSTALLDIR}" \
+ 		"${PYTHON2_CMD}" && \
+ 	  chmod 755 ${DESTDIR}${PREFIX}/bin/exaile
+-	sed "s|\@bindir\@|${EXAILEBINDIR}|" data/org.exaile.Exaile.service.in > \
++	sed "s|\@bindir\@|${PREFIX}/bin|" data/org.exaile.Exaile.service.in > \
+ 		${DESTDIR}${PREFIX}/share/dbus-1/services/org.exaile.Exaile.service
+ 	${MAKE} -C plugins install
+ 
+--- tools/generate-launcher	2012-08-30 17:58:21.000000000 -0400
++++ tools/generate-launcher.new	2012-09-24 11:37:21.872510082 -0400
+@@ -31,7 +31,7 @@
+ fi
+ XDG_DATA_DIRS="\${EXAILE_PREFIX}/share/:\${XDG_DATA_DIRS}"
+ export XDG_DATA_DIRS
+-exec ${PYTHON2_CMD} \${EXAILE_PREFIX}${LIBDIR}/exaile/exaile.py --datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui "\$@"
++exec ${PYTHON2_CMD} ${LIBDIR}/exaile/exaile.py --datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui "\$@"
+ exit \$?
+ 
+ EOF
diff --git a/exaile-udisks.patch b/exaile-3.3.0-udisks.patch
similarity index 87%
rename from exaile-udisks.patch
rename to exaile-3.3.0-udisks.patch
index cc776fa..499c04f 100644
--- a/exaile-udisks.patch
+++ b/exaile-3.3.0-udisks.patch
@@ -39,15 +39,6 @@
  
  class CDTocParser(object):
      #based on code from http://carey.geek.nz/code/python-cdrom/cdtoc.py
-@@ -150,7 +152,7 @@
-         sort_tups.sort()
-         sorted = [ s[1] for s in sort_tups ]
- 
--        self.add_tracks(sorted)
-+        self.extend(sorted)
- 
-         if CDDB_AVAIL:
-             self.get_cddb_info()
 @@ -244,6 +246,24 @@
  
          return cddev
@@ -73,9 +64,9 @@
  
  # vim: et sts=4 sw=4
  
---- xl/main.py	2011-07-18 20:32:50.690850000 -0400
-+++ xl/main.py.new	2011-08-31 13:57:44.678992423 -0400
-@@ -203,6 +203,8 @@
+--- xl/main.py	2012-09-09 15:07:41.000000000 -0400
++++ xl/main.py.new	2012-09-24 11:26:49.132168406 -0400
+@@ -251,6 +251,8 @@
          # Initialize HAL
          if self.options.Hal:
              from xl import hal
@@ -230,24 +221,3 @@
  
  # vim: et sts=4 sw=4
  
---- xlgui/panel/flatplaylist.py	2011-07-18 20:32:50.690850000 -0400
-+++ xlgui/panel/flatplaylist.py.new	2011-08-31 13:59:20.890789609 -0400
-@@ -29,7 +29,7 @@
- 
- from xl import metadata, trax
- from xl.nls import gettext as _
--from xlgui import panel, guiutil, menu
-+from xlgui import panel, guiutil, oldmenu as menu
- 
- class FlatPlaylistPanel(panel.Panel):
-     """
-@@ -116,8 +116,7 @@
-     def set_playlist(self, pl):
-         self.model.clear()
- 
--        tracks = pl.get_tracks()
--        self.tracks = tracks
-+        self.tracks = tracks = list(pl)
-         for i, track in enumerate(tracks):
-             self.model.append([i + 1, track.get_tag_display("title"), track])
- 
diff --git a/exaile.spec b/exaile.spec
index 305a986..62d831a 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,13 +1,13 @@
 Summary:	A music player
 Name:		exaile
-Version:	0.3.2.2
-Release:	2%{?dist}
+Version:	3.3.0
+Release:	1%{?dist}
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://www.exaile.org
-Source0:	http://launchpad.net/exaile/0.3.2/0.3.2.2/+download/exaile-%{version}.tar.gz
-Patch0:		exaile-makefile.patch
-Patch1:		exaile-udisks.patch
+Source0:	http://launchpad.net/exaile/3.3.x/3.3.0/+download/exaile-%{version}.tar.gz
+Patch0:		exaile-3.3.0-makefile.patch
+Patch1:		exaile-3.3.0-udisks.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pygobject2-devel
 BuildRequires:	desktop-file-utils
@@ -17,8 +17,7 @@ Requires:	python-mutagen >= 1.8
 Requires:	dbus-python
 Requires:	gstreamer-python >= 0.10
 Requires:	pygtk2
-Requires:	pygtk2-libglade
-Requires:	python-inotify
+Requires:	pygobject2
 Requires:	python-CDDB
 Requires:	udisks
 
@@ -48,7 +47,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 
-make install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} DESTDIR=%{buildroot} PYTHON2_CMD=%{_bindir}/python
 
 desktop-file-install --delete-original			\
 	--vendor="fedora"				\
@@ -67,10 +66,14 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/exaile.png
 %{_datadir}/exaile/
-%{_sysconfdir}/xdg/exaile/
+%{_datadir}/dbus-1/services/org.exaile.Exaile.service
+%config(noreplace) %{_sysconfdir}/xdg/exaile/
 %{_mandir}/man1/exaile*.*
 
 %changelog
+* Mon Sep 24 2012 Deji Akingunola <dakingun at gmail.com> - 3.3.0-1
+- Update to 3.3.0
+
 * Mon Sep 12 2011 Deji Akingunola <dakingun at gmail.com> - 0.3.2.2-2
 - Place exaile's private modules in %datadir
 - Trim (un-necessary?) requires
diff --git a/sources b/sources
index 17cb347..5d9cc6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3fd87e40af6592df0b511183ca49408  exaile-0.3.2.2.tar.gz
+4e716a0f47eec5adbf28306985d79f7f  exaile-3.3.0.tar.gz
