The package rpms/exaile.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/exaile.git/commit/?id=29e9dbf4ba4...
https://src.fedoraproject.org/cgit/rpms/exaile.git/commit/?id=b1297d99fb4...
https://src.fedoraproject.org/cgit/rpms/exaile.git/commit/?id=6d6b3cc6b49...
https://src.fedoraproject.org/cgit/rpms/exaile.git/commit/?id=73f370a7a24...
https://src.fedoraproject.org/cgit/rpms/exaile.git/commit/?id=b19c2782ece....
Change:
-%ifarch x86_64 ia64 ppc64 s390x sparc64
+%ifarch x86_64 ia64 ppc64 s390x sparc64
+%ifarch x86_64 ia64 ppc64 s390x
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x
Thanks.
Full change:
============
commit e6a18c7c0c939b91b583d87e8b7767d7d5fe15d6
Author: Graham White <graham_alton(a)hotmail.com>
Date: Mon Jul 12 14:27:39 2021 +0100
Update to 4.1.1, Python 3 compatibility. Respond to package review (BZ #1980282).
diff --git a/.gitignore b/.gitignore
index 0a2c2ea..5dde1e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ exaile-0.3.2.0.tar.gz
/exaile-3.4.3.tar.gz
/exaile-3.4.5.tar.gz
/exaile-4.0.0.tar.gz
+/exaile-4.1.1.tar.gz
diff --git a/d8bbcfd174b658babb6605799d1e9e788b578c84.patch
b/d8bbcfd174b658babb6605799d1e9e788b578c84.patch
new file mode 100644
index 0000000..960f711
--- /dev/null
+++ b/d8bbcfd174b658babb6605799d1e9e788b578c84.patch
@@ -0,0 +1,31 @@
+From 33220a748d340f83f3e053e0ba0afefef725aa87 Mon Sep 17 00:00:00 2001
+From: Johannes Sasongko <sasongko(a)gmail.com>
+Date: Fri, 2 Apr 2021 10:51:54 +1000
+Subject: [PATCH] trax/util.is_valid_track: Change new_for_uri to
+ new_for_commandline_arg
+
+In Exaile core this is always called with a URI so it works, but the tests
+call it with a local file path and we get test failures. (It must have
+worked in earlier GIO versions, because our CI doesn't catch this.)
+
+trax.Track uses new_for_commandline_arg for its location argument, so this
+should be correct.
+
+Fixes:
https://github.com/exaile/exaile/issues/750
+---
+ xl/trax/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xl/trax/util.py b/xl/trax/util.py
+index 2738a771e..b980d392d 100644
+--- a/xl/trax/util.py
++++ b/xl/trax/util.py
+@@ -45,7 +45,7 @@ def is_valid_track(location):
+ :returns: whether the file is a valid track
+ :rtype: boolean
+ """
+- extension = Gio.File.new_for_uri(location).get_basename().split(".")[-1]
++ extension =
Gio.File.new_for_commandline_arg(location).get_basename().split(".")[-1]
+ return extension.lower() in metadata.formats
+
+
diff --git a/exaile.spec b/exaile.spec
index 1cb2bab..24a4626 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,60 +1,70 @@
-# This package depends on automagic byte compilation
-#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
-%global _python_bytecompile_extra 1
-
Name: exaile
-Version: 4.0.0
+Version: 4.1.1
Release: 3%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{version}.ta...
+Patch0:
https://github.com/exaile/exaile/commit/d8bbcfd174b658babb6605799d1e9e788...
BuildArch: noarch
-
-BuildRequires: /usr/bin/pathfix.py
-BuildRequires: python2-rpm-macros
+BuildRequires: python3-rpm-macros
# Dependencies:
# see also
https://github.com/exaile/exaile/blob/master/DEPS
-
+BuildRequires: cairo-gobject
BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: gobject-introspection
+BuildRequires: gstreamer1-plugins-base >= 1.14
+BuildRequires: gstreamer1-plugins-good >= 1.14
+BuildRequires: gtk3 >= 3.22
BuildRequires: help2man
BuildRequires: libappstream-glib
-BuildRequires: pygobject3-devel >= 3.13.2
-BuildRequires: gobject-introspection
-
-Requires: python2
-Requires: gtk3 >= 3.10
-Requires: python2-gstreamer1 >= 1.4
-Requires: gstreamer1-plugins-good >= 1.6
-Requires: gstreamer1-plugins-base >= 1.4
-Requires: python2-mutagen >= 1.10
-Requires: python2-dbus
-Requires: pygobject3 >= 3.13.2
-Requires: python2-cairo
+BuildRequires: python3-bsddb3
+BuildRequires: python3-cairo
+BuildRequires: python3-dbus
+BuildRequires: python3-devel
+BuildRequires: python3-gobject-devel >= 3.22
+BuildRequires: python3-gstreamer1 >= 1.14
+BuildRequires: python3-mox3
+BuildRequires: python3-mutagen >= 1.38
+BuildRequires: python3-pytest
+BuildRequires: python3-setproctitle
+
+Requires: python3 >= 3.6
+Requires: python3-bsddb3
+Requires: gtk3 >= 3.22
+Requires: python3-gstreamer1 >= 1.14
+Requires: gstreamer1-plugins-good >= 1.14
+Requires: gstreamer1-plugins-base >= 1.14
+Requires: python3-mutagen >= 1.38
+Requires: python3-dbus
+Requires: python3-gobject >= 3.22
+Requires: python3-cairo
Requires: cairo-gobject
-Requires: python2-gobject
+Requires: python3-setproctitle
# Device detection:
Recommends: libudisks2
# CD info:
-Recommends: python2-cddb
+# This is currently broken on python3
+# See
https://github.com/exaile/exaile/issues/608 and
https://github.com/exaile/exaile/issues/652
+# Recommends: python3-cddb
# DAAP plugins (daapserver and daapclient):
#Not packaged for Fedora
#Recommends: spydaap
+#Recommends: python3-zeroconf
# Last.FM integration:
-Recommends: python2-pylast
+Recommends: python3-pylast
# Lyrics from
lyricsmania.com (lyricsmania):
-Recommends: python2-lxml
+Recommends: python3-lxml
# Lyrics from
lyrics.wikia.com (lyricwiki):
-Recommends: python2-beautifulsoup4
+Recommends: python3-beautifulsoup4
# Musicbrainz covers:
-Recommends: python2-musicbrainzngs
+Recommends: python3-musicbrainzngs
# Podcast plugin:
-#Not packaged for Fedora
-#Recommends: python2-feedparser
+Recommends: python3-feedparser
# Wikipedia info:
Recommends: webkit2gtk3
# Xlib-based hotkeys:
@@ -77,7 +87,7 @@ Recommends: streamripper
Exaile is a music player with a simple interface and powerful music
management capabilities. Features include automatic fetching of album art,
lyrics fetching, streaming internet radio, tabbed playlists, smart
-playlists with extensive filtering/search capabilities, and much more.
+playlists with extensive filtering/search capabilities, and much more.
Exaile is written using Python and GTK+ and is easily extensible via
plugins. There are over 50 plugins distributed with Exaile that include
@@ -87,23 +97,17 @@ ReplayGain, output via a secondary output device (great for DJs!),
and
much more.
%prep
-%setup -q
-# Corresponding to:
-# 1. Do not silently bytecompile.
-# 2. Preserve timestamps.
-find . -type f -name "Makefile" -exec \
- sed -i -e 's|compileall -q|compileall|g' \
- -e 's|install -m|install -pm|g' \
-{} + -print
+%autosetup -p1
%build
+%set_build_flags
+# Keep timestamps while installing
+# Delegate pyc compilation to brp-python-bytecompile
+sed -i "s|install -m|\$(INSTALL) -m|;s|all: compile |all: |" Makefile
%make_build
%install
-%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON2_CMD=%{__python2}
-
-# Some files got ambiguous python shebangs, we fix them after everything else is done
-pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/exaile/
+%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON3_CMD=%{__python3}
desktop-file-install --delete-original \
--dir=%{buildroot}%{_datadir}/applications \
@@ -112,8 +116,11 @@ desktop-file-install --delete-original \
%find_lang %{name}
%check
+# this test should be ignored on Fedora/Debian systems and also doesn't work via
Koji
+rm tests/xl/trax/test_migration.py
+
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
-#make test
+make test
%files -f %{name}.lang
%doc README.md
@@ -131,6 +138,13 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Jul 09 2021 Graham White <graham_alton(a)hotmail.com> - 4.1.1-2
+- Responding to package review (BZ #1980282)
+
+* Fri Apr 16 2021 Graham White <graham_alton(a)hotmail.com> - 4.1.1-1
+- Update to 4.1.1
+- Python 3 compatibility
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index fb58118..00bab01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (exaile-4.0.0.tar.gz) =
66ec7cafed6ac12dd528d0e7d7262e0b3300269e4fd3ded2016dfd5ea308d08b8b6000e61366de0d381b299c955442454559154d5f4e1f7e48cd62298f6a3e43
+SHA512 (exaile-4.1.1.tar.gz) =
66c52374d2e668d0a9609749bd5308c9a3c76beeddc4ca990a5533ee521292941e32c6e37c1721df719e3db8cc3ce5636bfe4c9e33ad80236464ea579c89a0b7
commit 8a585471c5f9e1319b3f84d1395b459944b94fad
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Jul 12 12:11:14 2021 +0200
Revert "https://fedoraproject.org/wiki/Changes/RetirePython2"
This reverts commit f224287bf0bc6249ff6136fc72a1db3d33309929.
Unretirement request:
https://pagure.io/releng/issue/10206
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0a2c2ea
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+exaile-0.3.2.0.tar.gz
+/exaile-0.3.2.1.tar.gz
+/exaile-0.3.2.2.tar.gz
+/exaile-3.3.0.tar.gz
+/exaile-3.3.1.tar.gz
+/exaile-3.3.2.tar.gz
+/exaile-3.4.2.tar.gz
+/exaile-3.4.3.tar.gz
+/exaile-3.4.5.tar.gz
+/exaile-4.0.0.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 22a75e4..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-https://fedoraproject.org/wiki/Changes/RetirePython2
diff --git a/exaile.spec b/exaile.spec
new file mode 100644
index 0000000..1cb2bab
--- /dev/null
+++ b/exaile.spec
@@ -0,0 +1,308 @@
+# This package depends on automagic byte compilation
+#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
+
+Name: exaile
+Version: 4.0.0
+Release: 3%{?dist}
+Summary: Simple but powerful Amarok-style music player for GTK users
+License: GPLv2+
+URL:
http://www.exaile.org
+Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{version}.ta...
+BuildArch: noarch
+
+
+BuildRequires: /usr/bin/pathfix.py
+BuildRequires: python2-rpm-macros
+
+# Dependencies:
+# see also
https://github.com/exaile/exaile/blob/master/DEPS
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: help2man
+BuildRequires: libappstream-glib
+BuildRequires: pygobject3-devel >= 3.13.2
+BuildRequires: gobject-introspection
+
+Requires: python2
+Requires: gtk3 >= 3.10
+Requires: python2-gstreamer1 >= 1.4
+Requires: gstreamer1-plugins-good >= 1.6
+Requires: gstreamer1-plugins-base >= 1.4
+Requires: python2-mutagen >= 1.10
+Requires: python2-dbus
+Requires: pygobject3 >= 3.13.2
+Requires: python2-cairo
+Requires: cairo-gobject
+Requires: python2-gobject
+
+# Device detection:
+Recommends: libudisks2
+# CD info:
+Recommends: python2-cddb
+# DAAP plugins (daapserver and daapclient):
+#Not packaged for Fedora
+#Recommends: spydaap
+# Last.FM integration:
+Recommends: python2-pylast
+# Lyrics from
lyricsmania.com (lyricsmania):
+Recommends: python2-lxml
+# Lyrics from
lyrics.wikia.com (lyricwiki):
+Recommends: python2-beautifulsoup4
+# Musicbrainz covers:
+Recommends: python2-musicbrainzngs
+# Podcast plugin:
+#Not packaged for Fedora
+#Recommends: python2-feedparser
+# Wikipedia info:
+Recommends: webkit2gtk3
+# Xlib-based hotkeys:
+Recommends: keybinder3
+# Scalable icons:
+Recommends: librsvg2
+# Native Notifications:
+Recommends: libnotify
+# Recording streams:
+Recommends: streamripper
+# Moodbar plugin:
+#FTBFS on Fedora 30+, may be dropped soon
+#Recommends: moodbar
+# BPM Counter plugin:
+#Not packaged for Fedora
+#* bpmdetect from gstreamer1-plugins-bad
+
+
+%description
+Exaile is a music player with a simple interface and powerful music
+management capabilities. Features include automatic fetching of album art,
+lyrics fetching, streaming internet radio, tabbed playlists, smart
+playlists with extensive filtering/search capabilities, and much more.
+
+Exaile is written using Python and GTK+ and is easily extensible via
+plugins. There are over 50 plugins distributed with Exaile that include
+advanced track tagging, last.fm scrobbling, support for portable media
+players, podcasts, internet radio such as icecast and Soma.FM,
+ReplayGain, output via a secondary output device (great for DJs!), and
+much more.
+
+%prep
+%setup -q
+# Corresponding to:
+# 1. Do not silently bytecompile.
+# 2. Preserve timestamps.
+find . -type f -name "Makefile" -exec \
+ sed -i -e 's|compileall -q|compileall|g' \
+ -e 's|install -m|install -pm|g' \
+{} + -print
+
+%build
+%make_build
+
+%install
+%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON2_CMD=%{__python2}
+
+# Some files got ambiguous python shebangs, we fix them after everything else is done
+pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/exaile/
+
+desktop-file-install --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
+#make test
+
+%files -f %{name}.lang
+%doc README.md
+%license COPYING
+%{_bindir}/exaile
+%{_datadir}/appdata/exaile.appdata.xml
+%{_datadir}/applications/exaile.desktop
+%{_datadir}/bash-completion/completions/exaile
+%{_datadir}/fish/vendor_completions.d/exaile.fish
+%{_datadir}/pixmaps/exaile.png
+%{_datadir}/exaile/
+%{_datadir}/dbus-1/services/org.exaile.Exaile.service
+%dir %{_sysconfdir}/xdg/exaile/
+%config(noreplace) %{_sysconfdir}/xdg/exaile/settings.ini
+%{_mandir}/man1/exaile*.1*
+
+%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jun 22 2019 Christian Stadelmann <genodeftest(a)fedoraproject.org> - 4.0.0-2
+- Update dependencies, add plugin dependencies as optional
+
+* Thu Jun 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.0-1
+- Update to 4.0.0
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.4.5-8
+- Escape macros in %%changelog
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Feb 06 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 3.4.5-6
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Sat Aug 26 2017 William Moreno <williamjmorenor(a)gmail.com> - 3.4.5-5
+- Update requires to python2 binary rename
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jul 10 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.5-1
+- Update to 3.4.5
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.4.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jan 09 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.3-1
+- Update to 3.4.3
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Feb 21 2014 Deji Akingunola <dakingun(a)gmail.com> - 3.3.2-1
+- Update to 3.3.2
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Mar 08 2013 Jon Ciesla <limburgher(a)gmail.com> - 3.3.1-3
+- Drop desktop vendor tag.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Nov 17 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Mon Sep 24 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.0-1
+- Update to 3.3.0
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Sep 12 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-2
+- Place exaile's private modules in %%datadir
+- Trim (un-necessary?) requires
+
+* Wed Aug 31 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-1
+- Update to 0.3.2.2
+- Drop hal. Apply patch to support udisk from upstream bzr's udisk branch
+
+* Thu Mar 03 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.1-1
+- Update to 0.3.2.1
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.3.2.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Mon Jun 28 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.0-1
+- Update to 0.3.2.0
+
+* Wed Jun 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.2-1
+- Update to 0.3.1.2
+
+* Fri Apr 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
+- Update to 0.3.1.1
+
+* Sat Mar 20 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.0-1
+- Update to 0.3.1.0
+
+* Wed Nov 25 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.2-1
+- Update to 0.3.0.2
+
+* Wed Sep 30 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.1-1
+- Update to 0.3.0.1
+
+* Fri Aug 28 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0-1
+- Update to 0.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 0.2.14-2
+- Rebuild for Python 2.6
+
+* Thu Oct 09 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.14-1
+- Update to 0.2.14
+
+* Fri Jul 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-3
+- fix license tag
+
+* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-2
+- fix conditional comparison
+- add sparc64 to 64bit arch check
+
+* Wed Apr 02 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.13-1
+- Update to 0.2.13
+
+* Sun Feb 10 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-2
+- Rebuild for gcc43
+
+* Thu Nov 29 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-1
+- Update to 0.2.11.1 that removes bogus cruft from 0.2.11 source tarball
+- Rebuild for firefox-2.0.0.10
+
+* Tue Nov 06 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-2
+- Rebuild for firefox-2.0.0.9
+
+* Mon Oct 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-1
+- New release
+
+* Tue Sep 11 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-3
+- Require pygtk2-libglade (BZ #278471)
+
+* Wed Aug 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
+- Rebuild
+
+* Fri Aug 03 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
+- License tag update
+
+* Sat Jun 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-1
+- New release
+
+* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
+- New release
+
+* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
+- New release
+
+* Sat Dec 30 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.7-1
+- New release
+
+* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-3
+- Rework the python include patch
+
+* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-2
+- Rewrite the build patch to be more generic
+
+* Tue Dec 26 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-1
+- First version for Fedora Extras
diff --git a/sources b/sources
new file mode 100644
index 0000000..fb58118
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (exaile-4.0.0.tar.gz) =
66ec7cafed6ac12dd528d0e7d7262e0b3300269e4fd3ded2016dfd5ea308d08b8b6000e61366de0d381b299c955442454559154d5f4e1f7e48cd62298f6a3e43
commit f224287bf0bc6249ff6136fc72a1db3d33309929
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jan 6 11:36:25 2020 +0100
https://fedoraproject.org/wiki/Changes/RetirePython2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0a2c2ea..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-exaile-0.3.2.0.tar.gz
-/exaile-0.3.2.1.tar.gz
-/exaile-0.3.2.2.tar.gz
-/exaile-3.3.0.tar.gz
-/exaile-3.3.1.tar.gz
-/exaile-3.3.2.tar.gz
-/exaile-3.4.2.tar.gz
-/exaile-3.4.3.tar.gz
-/exaile-3.4.5.tar.gz
-/exaile-4.0.0.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..22a75e4
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+https://fedoraproject.org/wiki/Changes/RetirePython2
diff --git a/exaile.spec b/exaile.spec
deleted file mode 100644
index 1cb2bab..0000000
--- a/exaile.spec
+++ /dev/null
@@ -1,308 +0,0 @@
-# This package depends on automagic byte compilation
-#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
-%global _python_bytecompile_extra 1
-
-Name: exaile
-Version: 4.0.0
-Release: 3%{?dist}
-Summary: Simple but powerful Amarok-style music player for GTK users
-License: GPLv2+
-URL:
http://www.exaile.org
-Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{version}.ta...
-BuildArch: noarch
-
-
-BuildRequires: /usr/bin/pathfix.py
-BuildRequires: python2-rpm-macros
-
-# Dependencies:
-# see also
https://github.com/exaile/exaile/blob/master/DEPS
-
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: help2man
-BuildRequires: libappstream-glib
-BuildRequires: pygobject3-devel >= 3.13.2
-BuildRequires: gobject-introspection
-
-Requires: python2
-Requires: gtk3 >= 3.10
-Requires: python2-gstreamer1 >= 1.4
-Requires: gstreamer1-plugins-good >= 1.6
-Requires: gstreamer1-plugins-base >= 1.4
-Requires: python2-mutagen >= 1.10
-Requires: python2-dbus
-Requires: pygobject3 >= 3.13.2
-Requires: python2-cairo
-Requires: cairo-gobject
-Requires: python2-gobject
-
-# Device detection:
-Recommends: libudisks2
-# CD info:
-Recommends: python2-cddb
-# DAAP plugins (daapserver and daapclient):
-#Not packaged for Fedora
-#Recommends: spydaap
-# Last.FM integration:
-Recommends: python2-pylast
-# Lyrics from
lyricsmania.com (lyricsmania):
-Recommends: python2-lxml
-# Lyrics from
lyrics.wikia.com (lyricwiki):
-Recommends: python2-beautifulsoup4
-# Musicbrainz covers:
-Recommends: python2-musicbrainzngs
-# Podcast plugin:
-#Not packaged for Fedora
-#Recommends: python2-feedparser
-# Wikipedia info:
-Recommends: webkit2gtk3
-# Xlib-based hotkeys:
-Recommends: keybinder3
-# Scalable icons:
-Recommends: librsvg2
-# Native Notifications:
-Recommends: libnotify
-# Recording streams:
-Recommends: streamripper
-# Moodbar plugin:
-#FTBFS on Fedora 30+, may be dropped soon
-#Recommends: moodbar
-# BPM Counter plugin:
-#Not packaged for Fedora
-#* bpmdetect from gstreamer1-plugins-bad
-
-
-%description
-Exaile is a music player with a simple interface and powerful music
-management capabilities. Features include automatic fetching of album art,
-lyrics fetching, streaming internet radio, tabbed playlists, smart
-playlists with extensive filtering/search capabilities, and much more.
-
-Exaile is written using Python and GTK+ and is easily extensible via
-plugins. There are over 50 plugins distributed with Exaile that include
-advanced track tagging, last.fm scrobbling, support for portable media
-players, podcasts, internet radio such as icecast and Soma.FM,
-ReplayGain, output via a secondary output device (great for DJs!), and
-much more.
-
-%prep
-%setup -q
-# Corresponding to:
-# 1. Do not silently bytecompile.
-# 2. Preserve timestamps.
-find . -type f -name "Makefile" -exec \
- sed -i -e 's|compileall -q|compileall|g' \
- -e 's|install -m|install -pm|g' \
-{} + -print
-
-%build
-%make_build
-
-%install
-%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON2_CMD=%{__python2}
-
-# Some files got ambiguous python shebangs, we fix them after everything else is done
-pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/exaile/
-
-desktop-file-install --delete-original \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-%find_lang %{name}
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
-#make test
-
-%files -f %{name}.lang
-%doc README.md
-%license COPYING
-%{_bindir}/exaile
-%{_datadir}/appdata/exaile.appdata.xml
-%{_datadir}/applications/exaile.desktop
-%{_datadir}/bash-completion/completions/exaile
-%{_datadir}/fish/vendor_completions.d/exaile.fish
-%{_datadir}/pixmaps/exaile.png
-%{_datadir}/exaile/
-%{_datadir}/dbus-1/services/org.exaile.Exaile.service
-%dir %{_sysconfdir}/xdg/exaile/
-%config(noreplace) %{_sysconfdir}/xdg/exaile/settings.ini
-%{_mandir}/man1/exaile*.1*
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Jun 22 2019 Christian Stadelmann <genodeftest(a)fedoraproject.org> - 4.0.0-2
-- Update dependencies, add plugin dependencies as optional
-
-* Thu Jun 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.0-1
-- Update to 4.0.0
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-10
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.4.5-8
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Feb 06 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 3.4.5-6
-- Update Python 2 dependency declarations to new packaging standards
- (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Sat Aug 26 2017 William Moreno <williamjmorenor(a)gmail.com> - 3.4.5-5
-- Update requires to python2 binary rename
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jul 10 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.5-1
-- Update to 3.4.5
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.4.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jan 09 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.3-1
-- Update to 3.4.3
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Feb 21 2014 Deji Akingunola <dakingun(a)gmail.com> - 3.3.2-1
-- Update to 3.3.2
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Mar 08 2013 Jon Ciesla <limburgher(a)gmail.com> - 3.3.1-3
-- Drop desktop vendor tag.
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Nov 17 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.1-1
-- Update to 3.3.1
-
-* Mon Sep 24 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.0-1
-- Update to 3.3.0
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Sep 12 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-2
-- Place exaile's private modules in %%datadir
-- Trim (un-necessary?) requires
-
-* Wed Aug 31 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-1
-- Update to 0.3.2.2
-- Drop hal. Apply patch to support udisk from upstream bzr's udisk branch
-
-* Thu Mar 03 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.1-1
-- Update to 0.3.2.1
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.3.2.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Mon Jun 28 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.0-1
-- Update to 0.3.2.0
-
-* Wed Jun 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.2-1
-- Update to 0.3.1.2
-
-* Fri Apr 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
-- Update to 0.3.1.1
-
-* Sat Mar 20 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.0-1
-- Update to 0.3.1.0
-
-* Wed Nov 25 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.2-1
-- Update to 0.3.0.2
-
-* Wed Sep 30 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.1-1
-- Update to 0.3.0.1
-
-* Fri Aug 28 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0-1
-- Update to 0.3.0
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 0.2.14-2
-- Rebuild for Python 2.6
-
-* Thu Oct 09 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.14-1
-- Update to 0.2.14
-
-* Fri Jul 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-3
-- fix license tag
-
-* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-2
-- fix conditional comparison
-- add sparc64 to 64bit arch check
-
-* Wed Apr 02 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.13-1
-- Update to 0.2.13
-
-* Sun Feb 10 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-2
-- Rebuild for gcc43
-
-* Thu Nov 29 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-1
-- Update to 0.2.11.1 that removes bogus cruft from 0.2.11 source tarball
-- Rebuild for firefox-2.0.0.10
-
-* Tue Nov 06 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-2
-- Rebuild for firefox-2.0.0.9
-
-* Mon Oct 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-1
-- New release
-
-* Tue Sep 11 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-3
-- Require pygtk2-libglade (BZ #278471)
-
-* Wed Aug 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
-- Rebuild
-
-* Fri Aug 03 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
-- License tag update
-
-* Sat Jun 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-1
-- New release
-
-* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
-- New release
-
-* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
-- New release
-
-* Sat Dec 30 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.7-1
-- New release
-
-* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-3
-- Rework the python include patch
-
-* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-2
-- Rewrite the build patch to be more generic
-
-* Tue Dec 26 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-1
-- First version for Fedora Extras
diff --git a/sources b/sources
deleted file mode 100644
index fb58118..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (exaile-4.0.0.tar.gz) =
66ec7cafed6ac12dd528d0e7d7262e0b3300269e4fd3ded2016dfd5ea308d08b8b6000e61366de0d381b299c955442454559154d5f4e1f7e48cd62298f6a3e43
commit 838011cb8da948eedb5ec48529d09ba3b9412921
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 00:02:14 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index 07e2bcb..1cb2bab 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -4,7 +4,7 @@
Name: exaile
Version: 4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -131,6 +131,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.0.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Sat Jun 22 2019 Christian Stadelmann <genodeftest(a)fedoraproject.org> - 4.0.0-2
- Update dependencies, add plugin dependencies as optional
commit 2d477e9336e7754fbffe4e0998bb458787615e28
Author: Christian Stadelmann <dev(a)genodeftest.de>
Date: Sat Jun 22 14:50:47 2019 +0200
Specfile: Unify indentation to spaces only
diff --git a/exaile.spec b/exaile.spec
index 7cc311d..07e2bcb 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -105,9 +105,9 @@ find . -type f -name "Makefile" -exec \
# Some files got ambiguous python shebangs, we fix them after everything else is done
pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/exaile/
-desktop-file-install --delete-original \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-install --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
commit b695bed928fd4c485ff59990c4a1ee6e201c3ad9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jun 22 15:01:02 2019 +0100
Fix missing BuildRequires needed for my fix shebang commit
diff --git a/exaile.spec b/exaile.spec
index 3b9c355..7cc311d 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -13,6 +13,7 @@ BuildArch: noarch
BuildRequires: /usr/bin/pathfix.py
+BuildRequires: python2-rpm-macros
# Dependencies:
# see also
https://github.com/exaile/exaile/blob/master/DEPS
commit d7d91fda71041b60360841ae9405b27d0e043e11
Author: Christian Stadelmann <dev(a)genodeftest.de>
Date: Sat Jun 22 11:40:41 2019 +0200
SPEC file: Update Dependencies, introduce optional deps
Sync dependencies with the latest state on
https://github.com/exaile/exaile/blob/master/DEPS.
diff --git a/exaile.spec b/exaile.spec
index 37af358..3b9c355 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -4,32 +4,73 @@
Name: exaile
Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{version}.ta...
BuildArch: noarch
-BuildRequires: desktop-file-utils
+
BuildRequires: /usr/bin/pathfix.py
+
+# Dependencies:
+# see also
https://github.com/exaile/exaile/blob/master/DEPS
+
+BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: help2man
BuildRequires: libappstream-glib
-BuildRequires: pygobject3-devel >= 2.18
+BuildRequires: pygobject3-devel >= 3.13.2
BuildRequires: gobject-introspection
-# Warning for the future releases:
-# gstreamer 1.x transition required.
-# RPM weak dependencies support.
-Requires: python2-dbus
-Requires: gstreamer1-plugins-good
+Requires: python2
+Requires: gtk3 >= 3.10
Requires: python2-gstreamer1 >= 1.4
-Requires: librsvg2
-Requires: pygobject3 >= 2.18
-Requires: python2-cddb
+Requires: gstreamer1-plugins-good >= 1.6
+Requires: gstreamer1-plugins-base >= 1.4
Requires: python2-mutagen >= 1.10
-Requires: udisks2
+Requires: python2-dbus
+Requires: pygobject3 >= 3.13.2
+Requires: python2-cairo
+Requires: cairo-gobject
+Requires: python2-gobject
+
+# Device detection:
+Recommends: libudisks2
+# CD info:
+Recommends: python2-cddb
+# DAAP plugins (daapserver and daapclient):
+#Not packaged for Fedora
+#Recommends: spydaap
+# Last.FM integration:
+Recommends: python2-pylast
+# Lyrics from
lyricsmania.com (lyricsmania):
+Recommends: python2-lxml
+# Lyrics from
lyrics.wikia.com (lyricwiki):
+Recommends: python2-beautifulsoup4
+# Musicbrainz covers:
+Recommends: python2-musicbrainzngs
+# Podcast plugin:
+#Not packaged for Fedora
+#Recommends: python2-feedparser
+# Wikipedia info:
+Recommends: webkit2gtk3
+# Xlib-based hotkeys:
+Recommends: keybinder3
+# Scalable icons:
+Recommends: librsvg2
+# Native Notifications:
+Recommends: libnotify
+# Recording streams:
+Recommends: streamripper
+# Moodbar plugin:
+#FTBFS on Fedora 30+, may be dropped soon
+#Recommends: moodbar
+# BPM Counter plugin:
+#Not packaged for Fedora
+#* bpmdetect from gstreamer1-plugins-bad
+
%description
Exaile is a music player with a simple interface and powerful music
@@ -89,6 +130,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Sat Jun 22 2019 Christian Stadelmann <genodeftest(a)fedoraproject.org> - 4.0.0-2
+- Update dependencies, add plugin dependencies as optional
+
* Thu Jun 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.0-1
- Update to 4.0.0
commit 75c7b70cf2188a3a989776a11a71106761a97ff9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Jun 21 17:56:39 2019 +0100
fix shebangs
diff --git a/exaile.spec b/exaile.spec
index 43d48b1..37af358 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -12,6 +12,7 @@ Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{ve
BuildArch: noarch
BuildRequires: desktop-file-utils
+BuildRequires: /usr/bin/pathfix.py
BuildRequires: gettext
BuildRequires: help2man
BuildRequires: libappstream-glib
@@ -59,6 +60,9 @@ find . -type f -name "Makefile" -exec \
%install
%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON2_CMD=%{__python2}
+# Some files got ambiguous python shebangs, we fix them after everything else is done
+pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/exaile/
+
desktop-file-install --delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
commit 2a8cbecac3dca7b10fdf6a52551e59a32d8af756
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Jun 20 11:36:21 2019 +0100
fix build deps
diff --git a/exaile.spec b/exaile.spec
index 58886c0..43d48b1 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -15,7 +15,8 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: help2man
BuildRequires: libappstream-glib
-BuildRequires: pygobject2-devel >= 2.18
+BuildRequires: pygobject3-devel >= 2.18
+BuildRequires: gobject-introspection
# Warning for the future releases:
# gstreamer 1.x transition required.
@@ -24,7 +25,7 @@ Requires: python2-dbus
Requires: gstreamer1-plugins-good
Requires: python2-gstreamer1 >= 1.4
Requires: librsvg2
-Requires: pygobject2 >= 2.18
+Requires: pygobject3 >= 2.18
Requires: python2-cddb
Requires: python2-mutagen >= 1.10
Requires: udisks2
commit fea893b36fdc331d81e738a7732508128b5da6ca
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Jun 20 10:48:49 2019 +0100
Update to 4.0.0
diff --git a/.gitignore b/.gitignore
index 6893cc6..0a2c2ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ exaile-0.3.2.0.tar.gz
/exaile-3.4.2.tar.gz
/exaile-3.4.3.tar.gz
/exaile-3.4.5.tar.gz
+/exaile-4.0.0.tar.gz
diff --git a/exaile-3.3.2-udisks.patch b/exaile-3.3.2-udisks.patch
deleted file mode 100644
index 303ff51..0000000
--- a/exaile-3.3.2-udisks.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-=== modified file 'plugins/cd/__init__.py'
---- plugins/cd/__init__.py 2012-10-03 04:43:15 +0000
-+++ plugins/cd/__init__.py 2012-11-09 04:25:00 +0000
-@@ -27,12 +27,12 @@
-
- from xl.nls import gettext as _
- from xl import providers, event
--from xl.hal import Handler
-+from xl.hal import Handler, UDisksProvider
- from xl.devices import Device
- import logging
- logger = logging.getLogger(__name__)
-
--PROVIDER = None
-+PROVIDER = PROVIDER_UDISKS = None
-
- import dbus, threading, os, struct
- from fcntl import ioctl
-@@ -61,15 +61,17 @@
- CDROM_DATA_TRACK = 0x04
-
- def enable(exaile):
-- global PROVIDER
-- PROVIDER = CDHandler()
-- providers.register("hal", PROVIDER)
--
-+ global PROVIDER, PROVIDER_UDISKS
-+ #~ PROVIDER = CDHandler()
-+ #~ providers.register("hal", PROVIDER)
-+ PROVIDER_UDISKS = UDisksCdProvider()
-+ providers.register("udisks", PROVIDER_UDISKS)
-
- def disable(exaile):
-- global PROVIDER
-+ global PROVIDER, PROVIDER_UDISKS
- providers.unregister("hal", PROVIDER)
-- PROVIDER = None
-+ providers.unregister("udisks", PROVIDER_UDISKS)
-+ PROVIDER = PROVIDER_UDISKS = None
-
- class CDTocParser(object):
- #based on code from
http://carey.geek.nz/code/python-cdrom/cdtoc.py
-@@ -186,7 +188,7 @@
- tr.set_tag_raw('genre',
- info['DGENRE'])
-
-- self._set_name(title[1].decode('iso-8859-15', 'replace'))
-+ self.name = title[1].decode('iso-8859-15', 'replace')
- event.log_event('cddb_info_retrieved', self, True)
-
- class CDDevice(Device):
-@@ -244,8 +246,25 @@
-
- return cddev
-
-+class UDisksCdProvider(UDisksProvider):
-+ name = 'cd'
-+ PRIORITY = UDisksProvider.NORMAL
-+
-+ def get_priority(self, obj):
-+ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
-+ iface = 'org.freedesktop.UDisks.Device'
-+ # DeviceChanged is called before and after tracks are read. We only want
-+ # the second case, so use number of audio tracks to identify supported
-+ # media. As a bonus, this means we never have to care about the type of
-+ # disc (CD, DVD, etc.).
-+ ntracks = props.Get(iface, 'OpticalDiscNumAudioTracks')
-+ return self.PRIORITY if ntracks > 0 else None
-+
-+ def get_device(self, obj):
-+ # TODO: If this is the same disc, return old device object.
-+ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
-+ iface = 'org.freedesktop.UDisks.Device'
-+ return CDDevice(dev=str(props.Get(iface, 'DeviceFile')))
-+
-
- # vim: et sts=4 sw=4
--
--
--
-
-=== modified file 'xl/hal.py'
---- xl/hal.py 2012-10-03 04:43:15 +0000
-+++ xl/hal.py 2012-11-09 04:25:00 +0000
-@@ -24,7 +24,7 @@
- # do so. If you do not wish to do so, delete this exception statement
- # from your version.
-
--import logging
-+import logging, threading, time
- import dbus
-
- from xl import common, providers, event, devices, settings
-@@ -32,6 +32,183 @@
-
- logger = logging.getLogger(__name__)
-
-+class UDisks(providers.ProviderHandler):
-+ """
-+ Provides support for UDisks devices.
-+
-+ If the D-Bus connection fails, this object will grow a "failed"
-+ attribute with True as the value. Plugins should check for this when
-+ registering if they want to provide HAL fallback. FIXME: There's a race
-+ condition here.
-+ """
-+
-+ # States: start -> init -> addremove <-> listening -> end.
-+ # The addremove state acts as a lock against concurrent changes.
-+
-+ def __init__(self, devicemanager):
-+ self._lock = lock = threading.Lock()
-+ self._state = 'init'
-+ logger.debug("UDisks: state = init")
-+
-+ providers.ProviderHandler.__init__(self, 'udisks')
-+ self.devicemanager = devicemanager
-+
-+ self.bus = self.obj = self.iface = None
-+ self.devices = {}
-+ self.providers = {}
-+
-+ #~ @common.threaded
-+ def connect(self):
-+ assert self._state == 'init'
-+ logger.debug("Connecting to UDisks")
-+ try:
-+ self.bus = bus = dbus.SystemBus()
-+ self.obj = obj = bus.get_object('org.freedesktop.UDisks',
'/org/freedesktop/UDisks')
-+ self.iface = iface = dbus.Interface(obj, 'org.freedesktop.UDisks')
-+ iface.connect_to_signal('DeviceAdded', self._udisks_device_added)
-+ iface.connect_to_signal('DeviceRemoved',
self._udisks_device_removed)
-+ iface.connect_to_signal('DeviceChanged', self._udisks_device_added)
-+ logger.info("Connected to UDisks")
-+ event.log_event("hal_connected", self, None)
-+ except Exception:
-+ logger.warning("Failed to connect to UDisks, " \
-+ "autodetection of devices will be disabled.")
-+ common.log_exception()
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening")
-+ self.failed = True
-+ return
-+ self._state = 'addremove'
-+ logger.debug("UDisks: state = addremove")
-+ self._add_all()
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening")
-+
-+ def _add_all(self):
-+ assert self._state == 'addremove'
-+ for path in self.iface.EnumerateDevices():
-+ self._add_device(path)
-+
-+ def _add_device(self, path=None, obj=None):
-+ """
-+ Call with either path or obj (obj gets priority). Not thread-safe.
-+ """
-+ assert self._state == 'addremove'
-+ if obj is None:
-+ obj = self.bus.get_object('org.freedesktop.UDisks', path)
-+
-+ # In the following code, `old` and `new` are providers, while
-+ # `self.devices[path]` and `device` are old/new devices. There are
-+ # several possible code paths that should be correctly handled:
-+ # - No old nor new provider for this path.
-+ # - Provider changes (nothing to something, something to nothing,
-+ # something to something else); obviously device changes as well.
-+ # - Provider stays the same, but device changes (i.e. instant media-
-+ # swapping; not sure it can happen).
-+ # - Provider and device stay the same.
-+ old, new = self._get_provider_for(obj)
-+ if new is None:
-+ if old is not None:
-+ self.devicemanager.remove_device(self.devices[path])
-+ del self.devices[path]
-+ return
-+ device = new.get_device(obj)
-+ if new is old and device is self.devices[path]:
-+ return # Exactly the same device
-+ if old is not None:
-+ self.devicemanager.remove_device(self.devices[path])
-+ if new is None:
-+ return
-+ try:
-+ device.autoconnect()
-+ except:
-+ logger.exception("Failed autoconnecting device " + str(device))
-+ else:
-+ self.devicemanager.add_device(device)
-+ self.providers[path] = new
-+ self.devices[path] = device
-+
-+ def _get_provider_for(self, obj):
-+ """
-+ Return (old_provider, old_priority), (new_provider, new_priority).
-+ Not thread-safe.
-+ """
-+ assert self._state == 'addremove'
-+ highest_prio = -1
-+ highest = None
-+ old = self.providers.get(obj.object_path)
-+ for provider in self.get_providers():
-+ priority = provider.get_priority(obj)
-+ if priority is None: continue
-+ # Find highest priority, preferring old provider.
-+ if priority > highest_prio or \
-+ (priority == highest_prio and provider is old):
-+ highest_prio = priority
-+ highest = provider
-+ return old, highest
-+
-+ def _remove_device(self, path):
-+ assert self._state == 'addremove'
-+ try:
-+ self.devicemanager.remove_device(self.devices[path])
-+ del self.devices[path]
-+ except KeyError:
-+ logger.warning("UDisks: Can't remove device (not found): " +
path)
-+
-+ def _udisks_device_added(self, path):
-+ logger.debug("UDisks: Device added: " + str(path))
-+ if self._addremove():
-+ self._add_device(path)
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening (_device_added)")
-+
-+ def _udisks_device_removed(self, path):
-+ if self._addremove():
-+ try:
-+ self._remove_device(path)
-+ logger.debug("UDisks: Device removed: " + str(path))
-+ except KeyError: # Not ours
-+ pass
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening")
-+
-+ # FIXME: Handle provider add/remove (following code unused & untested).
-+
-+ def on_provider_added(self, provider):
-+ if self._addremove():
-+ self._connect_all()
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening")
-+
-+ def on_provider_removed(self, provider):
-+ if self._addremove():
-+ for path, provider_ in self.providers.iteritems():
-+ if provider_ is provider:
-+ self._remove_device(path)
-+ self._state = 'listening'
-+ logger.debug("UDisks: state = listening")
-+
-+ def _addremove(self):
-+ """
-+ Helper to transition safely from listening to addremove state.
-+
-+ Returns whether the transition happens.
-+ """
-+ i = 0
-+ while True:
-+ with self._lock:
-+ if self._state == 'listening':
-+ self._state = 'addremove'
-+ logger.debug("UDisks: state = addremove")
-+ return True
-+ # If active state is init, we sleep and try again a few times.
-+ # TODO: Whose thread is this we are blocking?
-+ if i == 5:
-+ logger.error("UDisks: Failed to acquire lock. Ignoring device
event.")
-+ return False
-+ i += 1
-+ time.sleep(1)
-+
- class HAL(providers.ProviderHandler):
- """
- HAL interface
-@@ -144,6 +321,12 @@
- def device_from_udi(self, hal, udi):
- pass
-
-+class UDisksProvider:
-+ VERY_LOW, LOW, NORMAL, HIGH, VERY_HIGH = range(0, 101, 25)
-+ def get_priority(self, obj):
-+ pass # return: int [0..100] or None
-+ def get_device(self, obj):
-+ pass # return: xl.devices.Device
-+
-
- # vim: et sts=4 sw=4
--
-
-=== modified file 'xl/main.py'
---- xl/main.py 2012-10-24 04:33:53 +0000
-+++ xl/main.py 2012-11-09 04:25:00 +0000
-@@ -254,6 +254,8 @@
- # Initialize HAL
- if self.options.Hal:
- from xl import hal
-+ self.udisks = hal.UDisks(self.devices)
-+ self.udisks.connect()
- self.hal = hal.HAL(self.devices)
- self.hal.connect()
- else:
-
-=== modified file 'xl/trax/util.py'
---- xl/trax/util.py 2012-10-03 04:43:15 +0000
-+++ xl/trax/util.py 2012-11-09 04:25:00 +0000
-@@ -65,14 +65,17 @@
- tracks = []
-
- gloc = gio.File(uri)
-+
- # don't do advanced checking on streaming-type uris as it can fail or
- # otherwise be terribly slow.
- # TODO: move uri definition somewhere more common for easy reuse?
--
- if gloc.get_uri_scheme() in ('http', 'mms', 'cdda'):
- return [Track(uri)]
-
-- file_type = gloc.query_info("standard::type").get_file_type()
-+ try:
-+ file_type = gloc.query_info("standard::type").get_file_type()
-+ except gio.Error: # E.g. cdda
-+ file_type = None
- if file_type == gio.FILE_TYPE_DIRECTORY:
- # TODO: refactor Library so we dont need the collection obj
- from xl.collection import Library, Collection
-
-=== modified file 'xlgui/panel/flatplaylist.py'
---- xlgui/panel/flatplaylist.py 2012-10-03 04:43:15 +0000
-+++ xlgui/panel/flatplaylist.py 2012-11-09 04:25:00 +0000
-@@ -121,8 +121,7 @@
- def set_playlist(self, playlist):
- self.model.clear()
-
-- tracks = [track for track in playlist]
-- self.tracks = tracks
-+ self.tracks = tracks = list(playlist)
- 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 e1152ef..58886c0 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,26 +3,27 @@
%global _python_bytecompile_extra 1
Name: exaile
-Version: 3.4.5
-Release: 10%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
https://github.com/exaile/exaile/archive/%{version}.tar.gz#/%{name}-%{ver...
+Source0:
https://github.com/exaile/exaile/archive/%{version}/%{name}-%{version}.ta...
BuildArch: noarch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: help2man
BuildRequires: libappstream-glib
BuildRequires: pygobject2-devel >= 2.18
+
# Warning for the future releases:
# gstreamer 1.x transition required.
# RPM weak dependencies support.
Requires: python2-dbus
-Requires: gstreamer-plugins-good
-Requires: python2-gstreamer >= 0.10
+Requires: gstreamer1-plugins-good
+Requires: python2-gstreamer1 >= 1.4
Requires: librsvg2
-Requires: pygtk2 >= 2.17
Requires: pygobject2 >= 2.18
Requires: python2-cddb
Requires: python2-mutagen >= 1.10
@@ -55,7 +56,7 @@ find . -type f -name "Makefile" -exec \
%make_build
%install
-%make_install PREFIX=%{_prefix} LIBINSTALLDIR=/share PYTHON2_CMD=%{__python2}
+%make_install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} PYTHON2_CMD=%{__python2}
desktop-file-install --delete-original \
--dir=%{buildroot}%{_datadir}/applications \
@@ -68,11 +69,13 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
#make test
%files -f %{name}.lang
-%doc FUTURE
+%doc README.md
%license COPYING
%{_bindir}/exaile
%{_datadir}/appdata/exaile.appdata.xml
%{_datadir}/applications/exaile.desktop
+%{_datadir}/bash-completion/completions/exaile
+%{_datadir}/fish/vendor_completions.d/exaile.fish
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
%{_datadir}/dbus-1/services/org.exaile.Exaile.service
@@ -81,6 +84,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Thu Jun 20 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.0-1
+- Update to 4.0.0
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 9498b4e..fb58118 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd0d0fbc4edfc9dfb9d18513614c0184 exaile-3.4.5.tar.gz
+SHA512 (exaile-4.0.0.tar.gz) =
66ec7cafed6ac12dd528d0e7d7262e0b3300269e4fd3ded2016dfd5ea308d08b8b6000e61366de0d381b299c955442454559154d5f4e1f7e48cd62298f6a3e43
commit a24a045a642f244c217b6e07a9045b6cab207903
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 19:11:50 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index 5dd5a4b..e1152ef 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -4,7 +4,7 @@
Name: exaile
Version: 3.4.5
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -81,6 +81,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 86e3337749d9c65181590024a7dd9dc93135442e
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 29 06:15:45 2019 +0100
Remove obsolete scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index e709a6e..5dd5a4b 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -67,12 +67,6 @@ desktop-file-install --delete-original \
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
#make test
-%post
-update-desktop-database &> /dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
-
%files -f %{name}.lang
%doc FUTURE
%license COPYING
commit e3cc34fe52a944d85f550d3b903937b1ec455db6
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Nov 15 12:53:54 2018 +0100
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
diff --git a/exaile.spec b/exaile.spec
index c07ef60..e709a6e 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,3 +1,7 @@
+# This package depends on automagic byte compilation
+#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
+
Name: exaile
Version: 3.4.5
Release: 9%{?dist}
commit 74ca22ae085dec9489494f7184f5f3c39c87cb11
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 00:13:39 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index fff1ee1..c07ef60 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.4.5-8
- Escape macros in %%changelog
commit ec0e2005955f8170a3e7bb5ea73070b31cb0457c
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 9 09:04:27 2018 +0100
Escape macros in %changelog
Reference:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index 15179d6..fff1ee1 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 3.4.5-8
+- Escape macros in %%changelog
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -139,7 +142,7 @@ update-desktop-database &> /dev/null || :
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Sep 12 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-2
-- Place exaile's private modules in %datadir
+- Place exaile's private modules in %%datadir
- Trim (un-necessary?) requires
* Wed Aug 31 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-1
commit c4c3f181180b19280eafe5313a1c0c3c65e69e2a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 09:03:12 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index 3b7e4f6..15179d6 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Tue Feb 06 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 3.4.5-6
- Update Python 2 dependency declarations to new packaging standards
(See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
commit 84037fd8113362b3087802ef8a5fb50c327fcb8d
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Tue Feb 6 23:54:56 2018 +0100
Update Python 2 dependency declarations to new packaging standards
diff --git a/exaile.spec b/exaile.spec
index b9a3c96..3b7e4f6 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -14,14 +14,14 @@ BuildRequires: pygobject2-devel >= 2.18
# Warning for the future releases:
# gstreamer 1.x transition required.
# RPM weak dependencies support.
-Requires: dbus-python
+Requires: python2-dbus
Requires: gstreamer-plugins-good
-Requires: gstreamer-python >= 0.10
+Requires: python2-gstreamer >= 0.10
Requires: librsvg2
Requires: pygtk2 >= 2.17
Requires: pygobject2 >= 2.18
-Requires: python2-CDDB
-Requires: python-mutagen >= 1.10
+Requires: python2-cddb
+Requires: python2-mutagen >= 1.10
Requires: udisks2
%description
@@ -83,6 +83,10 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Tue Feb 06 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 3.4.5-6
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Sat Aug 26 2017 William Moreno <williamjmorenor(a)gmail.com> - 3.4.5-5
- Update requires to python2 binary rename
commit 57cf604f4b70953eac1bb6027371280d40faace8
Author: William Moreno Reyes <williamjmorenor(a)fedoraproject.org>
Date: Sat Aug 26 12:54:15 2017 -0600
Fix broken dep
Signed-off-by: William Moreno Reyes <williamjmorenor(a)fedoraproject.org>
diff --git a/exaile.spec b/exaile.spec
index a4d0ef3..b9a3c96 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -20,7 +20,7 @@ Requires: gstreamer-python >= 0.10
Requires: librsvg2
Requires: pygtk2 >= 2.17
Requires: pygobject2 >= 2.18
-Requires: python-CDDB
+Requires: python2-CDDB
Requires: python-mutagen >= 1.10
Requires: udisks2
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Sat Aug 26 2017 William Moreno <williamjmorenor(a)gmail.com> - 3.4.5-5
+- Update requires to python2 binary rename
+
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit e657cbc0d759aacd4caf0009c93474e6b5ec6bcf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 26 07:53:45 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 909e2b8..a4d0ef3 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 40b8fd43fef7bb1674aadf70f256346a11f8beb9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 10 09:29:17 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 719f9c0..909e2b8 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit e116aec6dd30455fd6303c65104479ac455e432a
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 3 20:08:30 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 1cc50be..719f9c0 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -83,6 +83,9 @@ update-desktop-database &> /dev/null || :
%{_mandir}/man1/exaile*.1*
%changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.5-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Fri Jul 10 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.5-1
- Update to 3.4.5
commit 3862b034a2df54ae348468a2b7f15ac7443addd0
Author: Christopher Meng <i(a)cicku.me>
Date: Mon Jul 27 22:09:07 2015 -0400
Added missing desktop database refresh script
diff --git a/exaile.spec b/exaile.spec
index d50a574..1cc50be 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Name: exaile
Version: 3.4.5
Release: 1%{?dist}
-Summary: A simple but powerful Amarok-style music player for GTK users
+Summary: Simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
Source0:
https://github.com/exaile/exaile/archive/%{version}.tar.gz#/%{name}-%{ver...
@@ -63,6 +63,12 @@ desktop-file-install --delete-original \
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
#make test
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
%files -f %{name}.lang
%doc FUTURE
%license COPYING
commit 7322859bec466cfc20be495e0c56454fdb6b5c37
Author: Christopher Meng <i(a)cicku.me>
Date: Mon Jul 27 21:55:06 2015 -0400
Update to 3.4.5
diff --git a/.gitignore b/.gitignore
index 6c883f0..6893cc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ exaile-0.3.2.0.tar.gz
/exaile-3.3.2.tar.gz
/exaile-3.4.2.tar.gz
/exaile-3.4.3.tar.gz
+/exaile-3.4.5.tar.gz
diff --git a/exaile.spec b/exaile.spec
index b129f21..d50a574 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
-Version: 3.4.3
-Release: 2%{?dist}
+Version: 3.4.5
+Release: 1%{?dist}
Summary: A simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -11,6 +11,9 @@ BuildRequires: gettext
BuildRequires: help2man
BuildRequires: libappstream-glib
BuildRequires: pygobject2-devel >= 2.18
+# Warning for the future releases:
+# gstreamer 1.x transition required.
+# RPM weak dependencies support.
Requires: dbus-python
Requires: gstreamer-plugins-good
Requires: gstreamer-python >= 0.10
@@ -61,7 +64,8 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
#make test
%files -f %{name}.lang
-%doc COPYING FUTURE
+%doc FUTURE
+%license COPYING
%{_bindir}/exaile
%{_datadir}/appdata/exaile.appdata.xml
%{_datadir}/applications/exaile.desktop
@@ -73,6 +77,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Jul 10 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.5-1
+- Update to 3.4.5
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.4.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index 4404274..9498b4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fce93708264c66d9287e3bbafd803601 exaile-3.4.3.tar.gz
+bd0d0fbc4edfc9dfb9d18513614c0184 exaile-3.4.5.tar.gz
commit 39a58f91840cb6607f6c7f6fe2e98151bc3ed57f
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jun 17 05:51:26 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index ceabd54..b129f21 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,6 +1,6 @@
Name: exaile
Version: 3.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple but powerful Amarok-style music player for GTK users
License: GPLv2+
URL:
http://www.exaile.org
@@ -73,6 +73,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%{_mandir}/man1/exaile*.1*
%changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.4.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Fri Jan 09 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.3-1
- Update to 3.4.3
commit 1b7618f13a366431c48c6a7fb90abe3c9282e6e1
Author: Christopher Meng <i(a)cicku.me>
Date: Sat Feb 7 09:13:13 2015 +0800
Update to 3.4.3
diff --git a/.gitignore b/.gitignore
index 974efc6..6c883f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ exaile-0.3.2.0.tar.gz
/exaile-3.3.0.tar.gz
/exaile-3.3.1.tar.gz
/exaile-3.3.2.tar.gz
+/exaile-3.4.2.tar.gz
+/exaile-3.4.3.tar.gz
diff --git a/exaile-3.3.1-makefile.patch b/exaile-3.3.1-makefile.patch
deleted file mode 100644
index 31e22c5..0000000
--- a/exaile-3.3.1-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile 2012-11-15 12:28:50.000000000 -0500
-+++ Makefile.new 2012-11-17 07:33:52.334486249 -0500
-@@ -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-11-15 12:28:50.000000000 -0500
-+++ tools/generate-launcher.new 2012-11-17 07:27:37.237377857 -0500
-@@ -34,7 +34,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 ${DEFAULTARGS} "\$@"
-+exec ${PYTHON2_CMD} ${LIBDIR}/exaile/exaile.py
--datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui ${DEFAULTARGS} "\$@"
- exit \$?
-
- EOF
diff --git a/exaile.spec b/exaile.spec
index 4a1b3e3..ceabd54 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,53 +1,54 @@
-Summary: A music player
-Name: exaile
-Version: 3.3.2
-Release: 2%{?dist}
-Group: Applications/Multimedia
-License: GPLv2+
-URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/3.3.x/3.3.2/+download/exaile-%{version}.tar.gz
-Patch0: exaile-3.3.1-makefile.patch
-Patch1: exaile-3.3.2-udisks.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pygobject2-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext help2man
-
-Requires: python-mutagen >= 1.8
-Requires: dbus-python
-Requires: gstreamer-python >= 0.10
-Requires: pygtk2
-Requires: pygobject2
-Requires: python-CDDB
-Requires: udisks
-
-BuildArch: noarch
+Name: exaile
+Version: 3.4.3
+Release: 1%{?dist}
+Summary: A simple but powerful Amarok-style music player for GTK users
+License: GPLv2+
+URL:
http://www.exaile.org
+Source0:
https://github.com/exaile/exaile/archive/%{version}.tar.gz#/%{name}-%{ver...
+BuildArch: noarch
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: help2man
+BuildRequires: libappstream-glib
+BuildRequires: pygobject2-devel >= 2.18
+Requires: dbus-python
+Requires: gstreamer-plugins-good
+Requires: gstreamer-python >= 0.10
+Requires: librsvg2
+Requires: pygtk2 >= 2.17
+Requires: pygobject2 >= 2.18
+Requires: python-CDDB
+Requires: python-mutagen >= 1.10
+Requires: udisks2
%description
-Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
-It incorporates many of the cool things from AmaroK (and other media players)
-like automatic fetching of album art, handling of large libraries, lyrics
-fetching, artist/album information via the wikipedia, last.fm support, optional
-iPod support (assuming you have python-gpod installed).
-
-In addition, Exaile also includes a built in shoutcast directory browser,
-tabbed playlists (so you can have more than one playlist open at a time),
-blacklisting of tracks (so they don't get scanned into your library),
-downloading of guitar tablature from
fretplay.com, and submitting played tracks
-on your iPod to last.fm
+Exaile is a music player with a simple interface and powerful music
+management capabilities. Features include automatic fetching of album art,
+lyrics fetching, streaming internet radio, tabbed playlists, smart
+playlists with extensive filtering/search capabilities, and much more.
+
+Exaile is written using Python and GTK+ and is easily extensible via
+plugins. There are over 50 plugins distributed with Exaile that include
+advanced track tagging, last.fm scrobbling, support for portable media
+players, podcasts, internet radio such as icecast and Soma.FM,
+ReplayGain, output via a secondary output device (great for DJs!), and
+much more.
%prep
%setup -q
-%patch0 -p0 -b .fix
-%patch1 -p0 -b .udisk
+# Corresponding to:
+# 1. Do not silently bytecompile.
+# 2. Preserve timestamps.
+find . -type f -name "Makefile" -exec \
+ sed -i -e 's|compileall -q|compileall|g' \
+ -e 's|install -m|install -pm|g' \
+{} + -print
%build
-make %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
+%make_build
-make install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} DESTDIR=%{buildroot}
PYTHON2_CMD=%{_bindir}/python
+%install
+%make_install PREFIX=%{_prefix} LIBINSTALLDIR=/share PYTHON2_CMD=%{__python2}
desktop-file-install --delete-original \
--dir=%{buildroot}%{_datadir}/applications \
@@ -55,21 +56,26 @@ desktop-file-install --delete-original \
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
+#make test
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING
+%doc COPYING FUTURE
%{_bindir}/exaile
-%{_datadir}/applications/*.desktop
+%{_datadir}/appdata/exaile.appdata.xml
+%{_datadir}/applications/exaile.desktop
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
%{_datadir}/dbus-1/services/org.exaile.Exaile.service
-%config(noreplace) %{_sysconfdir}/xdg/exaile/
-%{_mandir}/man1/exaile*.*
+%dir %{_sysconfdir}/xdg/exaile/
+%config(noreplace) %{_sysconfdir}/xdg/exaile/settings.ini
+%{_mandir}/man1/exaile*.1*
%changelog
+* Fri Jan 09 2015 Christopher Meng <rpm(a)cicku.me> - 3.4.3-1
+- Update to 3.4.3
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8f007e3..4404274 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-117994e96065b4f767ac552c80808040 exaile-3.3.2.tar.gz
+fce93708264c66d9287e3bbafd803601 exaile-3.4.3.tar.gz
commit 385c4e65b7acbf5159b42773b295ac02262f49ff
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 06:12:08 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index c8eac3d..4a1b3e3 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 3.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Fri Feb 21 2014 Deji Akingunola <dakingun(a)gmail.com> - 3.3.2-1
- Update to 3.3.2
commit cf56c702b958e6d941d71807d2e457cb760cd414
Author: Deji Akingunola <dakingun(a)gmail.com>
Date: Fri Feb 21 00:52:00 2014 -0500
Update to 3.3.2
diff --git a/.gitignore b/.gitignore
index 2a19c8e..974efc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ exaile-0.3.2.0.tar.gz
/exaile-0.3.2.2.tar.gz
/exaile-3.3.0.tar.gz
/exaile-3.3.1.tar.gz
+/exaile-3.3.2.tar.gz
diff --git a/exaile-3.3.1-udisks.patch b/exaile-3.3.1-udisks.patch
deleted file mode 100644
index ef808a7..0000000
--- a/exaile-3.3.1-udisks.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- plugins/cd/__init__.py 2011-07-18 20:32:50.690850000 -0400
-+++ plugins/cd/__init__.py.new 2011-08-31 13:41:50.277924078 -0400
-@@ -27,12 +27,12 @@
-
- from xl.nls import gettext as _
- from xl import providers, event
--from xl.hal import Handler
-+from xl.hal import Handler, UDisksProvider
- from xl.devices import Device
- import logging
- logger = logging.getLogger(__name__)
-
--PROVIDER = None
-+PROVIDER = PROVIDER_UDISKS = None
-
- import dbus, threading, os, struct
- from fcntl import ioctl
-@@ -61,15 +61,17 @@
- CDROM_DATA_TRACK = 0x04
-
- def enable(exaile):
-- global PROVIDER
-- PROVIDER = CDHandler()
-- providers.register("hal", PROVIDER)
--
-+ global PROVIDER, PROVIDER_UDISKS
-+ #~ PROVIDER = CDHandler()
-+ #~ providers.register("hal", PROVIDER)
-+ PROVIDER_UDISKS = UDisksCdProvider()
-+ providers.register("udisks", PROVIDER_UDISKS)
-
- def disable(exaile):
-- global PROVIDER
-+ global PROVIDER, PROVIDER_UDISKS
- providers.unregister("hal", PROVIDER)
-- PROVIDER = None
-+ providers.unregister("udisks", PROVIDER_UDISKS)
-+ PROVIDER = PROVIDER_UDISKS = None
-
- class CDTocParser(object):
- #based on code from
http://carey.geek.nz/code/python-cdrom/cdtoc.py
-@@ -244,6 +246,24 @@
-
- return cddev
-
-+class UDisksCdProvider(UDisksProvider):
-+ PRIORITY = UDisksProvider.NORMAL
-+
-+ name = 'cd'
-+
-+ def get_priority(self, obj):
-+ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
-+ iface = 'org.freedesktop.UDisks.Device'
-+ # XXX: We use the number of audio tracks to identify audio CDs.
-+ # There may be a better way....
-+ compat = props.Get(iface, 'DriveMediaCompatibility')
-+ return self.PRIORITY if 'optical_cd' in compat else None
-+
-+ def create_device(self, obj):
-+ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
-+ iface = 'org.freedesktop.UDisks.Device'
-+ return CDDevice(dev=props.Get(iface, 'DeviceFile'))
-+
-
- # vim: et sts=4 sw=4
-
---- xl/main.py 2012-09-09 15:07:41.000000000 -0400
-+++ xl/main.py.new 2012-09-24 11:26:49.132168406 -0400
-@@ -254,6 +254,8 @@
- # Initialize HAL
- if self.options.Hal:
- from xl import hal
-+ self.udisks = hal.UDisks(self.devices)
-+ self.udisks.connect()
- self.hal = hal.HAL(self.devices)
- self.hal.connect()
- else:
---- xl/hal.py 2011-07-18 20:32:50.690850000 -0400
-+++ xl/hal.py.new 2011-08-31 13:49:02.489520690 -0400
-@@ -24,7 +24,7 @@
- # do so. If you do not wish to do so, delete this exception statement
- # from your version.
-
--import logging
-+import logging, threading, time
- import dbus
-
- from xl import common, providers, event, devices, settings
-@@ -32,6 +32,120 @@
-
- logger = logging.getLogger(__name__)
-
-+class UDisks(providers.ProviderHandler):
-+ """Provides support for UDisks devices.
-+
-+ If the D-Bus connection fails, this object will grow a "failed" attribute
-+ with True as the value. Plugins should check for this attribute when
-+ registering if they want to provide HAL fallback. FIXME: There's a race
-+ condition here.
-+ """
-+
-+ # States: start -> init -> addremove <-> listening -> end.
-+ # The addremove state acts as a lock against concurrent changes.
-+
-+ def __init__(self, devicemanager):
-+ self._lock = lock = threading.Lock()
-+ self._state = 'init'
-+
-+ providers.ProviderHandler.__init__(self, 'udisks')
-+ self.devicemanager = devicemanager
-+
-+ self.bus = self.obj = self.iface = None
-+ self.devices = {}
-+ self.providers = {}
-+
-+ @common.threaded
-+ def connect(self):
-+ assert self._state == 'init'
-+ logger.debug("Connecting to UDisks")
-+ try:
-+ self.bus = bus = dbus.SystemBus()
-+ self.obj = obj = bus.get_object('org.freedesktop.UDisks',
'/org/freedesktop/UDisks')
-+ self.iface = iface = dbus.Interface(obj, 'org.freedesktop.UDisks')
-+ iface.connect_to_signal('DeviceAdded', self._device_added,
path_keyword='path')
-+ iface.connect_to_signal('DeviceRemoved', self._device_removed,
path_keyword='path')
-+ logger.info("Connected to UDisks")
-+ event.log_event("hal_connected", self, None)
-+ except Exception:
-+ logger.warning("Failed to connect to UDisks, " \
-+ "autodetection of devices will be disabled.")
-+ self._state = 'listening'
-+ self.failed = True
-+ return
-+ self._state = 'addremove'
-+ self._add_all()
-+ self._state = 'listening'
-+
-+ def _add_all(self):
-+ assert self._state == 'addremove'
-+ for path in self.iface.EnumerateDevices():
-+ self._add_path(path)
-+
-+ def _add_path(self, path):
-+ assert self._state == 'addremove'
-+ obj = self.bus.get_object('org.freedesktop.UDisks', path)
-+ old, new = self._get_provider_for(obj)
-+ if new is not old:
-+ if old[0]:
-+ self.devicemanager.remove_device(self.devices[path])
-+ device = new[0].create_device(obj)
-+ device.autoconnect()
-+ self.devicemanager.add_device(device)
-+ self.providers[path] = new
-+ self.devices[path] = device
-+
-+ def _get_provider_for(self, obj):
-+ """Return (old_provider, old_priority), (new_provider,
new_priority)"""
-+ assert self._state == 'addremove'
-+ path = obj.object_path
-+ highest = old = self.providers.get(path, (None, -1))
-+ for provider in self.get_providers():
-+ priority = provider.get_priority(obj)
-+ if priority is not None and priority > highest[1]:
-+ highest = (provider, priority)
-+ return old, highest
-+
-+ def _remove_path(self, path):
-+ assert self._state == 'addremove'
-+ self.devicemanager.remove_device(self.devices[path])
-+ del self.devices[path]
-+
-+ def _device_added(self, path):
-+ import pdb; pdb.set_trace()
-+ self._addremove()
-+ self._add_path(path)
-+ self._state = 'listening'
-+
-+ def _device_removed(self, path):
-+ self._addremove()
-+ try:
-+ self._remove_path(path)
-+ except KeyError: # Not ours
-+ pass
-+ self._state = 'listening'
-+
-+ def on_provider_added(self, provider):
-+ self._addremove()
-+ self._connect_all()
-+ self._state = 'listening'
-+
-+ def on_provider_removed(self, provider):
-+ self._addremove()
-+ for path, provider_ in self.providers.iteritems():
-+ if provider_ is provider:
-+ self._remove_path(path)
-+ self._state = 'listening'
-+
-+ def _addremove(self):
-+ """Helper to transition safely to the addremove
state"""
-+ while True:
-+ with self._lock:
-+ if self._state == 'listening':
-+ self._state = 'addremove'
-+ break
-+ time.sleep(1)
-+
- class HAL(providers.ProviderHandler):
- """
- HAL interface
-@@ -144,6 +258,13 @@
- def device_from_udi(self, hal, udi):
- pass
-
-+class UDisksProvider:
-+ VERY_LOW, LOW, NORMAL, HIGH, VERY_HIGH = range(0, 101, 25)
-+ def get_priority(self, obj):
-+ pass # return: int [0..100] or None
-+ def get_device(self, obj):
-+ pass # return: xl.devices.Device
-+
-
- # vim: et sts=4 sw=4
-
diff --git a/exaile-3.3.2-udisks.patch b/exaile-3.3.2-udisks.patch
new file mode 100644
index 0000000..303ff51
--- /dev/null
+++ b/exaile-3.3.2-udisks.patch
@@ -0,0 +1,343 @@
+=== modified file 'plugins/cd/__init__.py'
+--- plugins/cd/__init__.py 2012-10-03 04:43:15 +0000
++++ plugins/cd/__init__.py 2012-11-09 04:25:00 +0000
+@@ -27,12 +27,12 @@
+
+ from xl.nls import gettext as _
+ from xl import providers, event
+-from xl.hal import Handler
++from xl.hal import Handler, UDisksProvider
+ from xl.devices import Device
+ import logging
+ logger = logging.getLogger(__name__)
+
+-PROVIDER = None
++PROVIDER = PROVIDER_UDISKS = None
+
+ import dbus, threading, os, struct
+ from fcntl import ioctl
+@@ -61,15 +61,17 @@
+ CDROM_DATA_TRACK = 0x04
+
+ def enable(exaile):
+- global PROVIDER
+- PROVIDER = CDHandler()
+- providers.register("hal", PROVIDER)
+-
++ global PROVIDER, PROVIDER_UDISKS
++ #~ PROVIDER = CDHandler()
++ #~ providers.register("hal", PROVIDER)
++ PROVIDER_UDISKS = UDisksCdProvider()
++ providers.register("udisks", PROVIDER_UDISKS)
+
+ def disable(exaile):
+- global PROVIDER
++ global PROVIDER, PROVIDER_UDISKS
+ providers.unregister("hal", PROVIDER)
+- PROVIDER = None
++ providers.unregister("udisks", PROVIDER_UDISKS)
++ PROVIDER = PROVIDER_UDISKS = None
+
+ class CDTocParser(object):
+ #based on code from
http://carey.geek.nz/code/python-cdrom/cdtoc.py
+@@ -186,7 +188,7 @@
+ tr.set_tag_raw('genre',
+ info['DGENRE'])
+
+- self._set_name(title[1].decode('iso-8859-15', 'replace'))
++ self.name = title[1].decode('iso-8859-15', 'replace')
+ event.log_event('cddb_info_retrieved', self, True)
+
+ class CDDevice(Device):
+@@ -244,8 +246,25 @@
+
+ return cddev
+
++class UDisksCdProvider(UDisksProvider):
++ name = 'cd'
++ PRIORITY = UDisksProvider.NORMAL
++
++ def get_priority(self, obj):
++ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
++ iface = 'org.freedesktop.UDisks.Device'
++ # DeviceChanged is called before and after tracks are read. We only want
++ # the second case, so use number of audio tracks to identify supported
++ # media. As a bonus, this means we never have to care about the type of
++ # disc (CD, DVD, etc.).
++ ntracks = props.Get(iface, 'OpticalDiscNumAudioTracks')
++ return self.PRIORITY if ntracks > 0 else None
++
++ def get_device(self, obj):
++ # TODO: If this is the same disc, return old device object.
++ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
++ iface = 'org.freedesktop.UDisks.Device'
++ return CDDevice(dev=str(props.Get(iface, 'DeviceFile')))
++
+
+ # vim: et sts=4 sw=4
+-
+-
+-
+
+=== modified file 'xl/hal.py'
+--- xl/hal.py 2012-10-03 04:43:15 +0000
++++ xl/hal.py 2012-11-09 04:25:00 +0000
+@@ -24,7 +24,7 @@
+ # do so. If you do not wish to do so, delete this exception statement
+ # from your version.
+
+-import logging
++import logging, threading, time
+ import dbus
+
+ from xl import common, providers, event, devices, settings
+@@ -32,6 +32,183 @@
+
+ logger = logging.getLogger(__name__)
+
++class UDisks(providers.ProviderHandler):
++ """
++ Provides support for UDisks devices.
++
++ If the D-Bus connection fails, this object will grow a "failed"
++ attribute with True as the value. Plugins should check for this when
++ registering if they want to provide HAL fallback. FIXME: There's a race
++ condition here.
++ """
++
++ # States: start -> init -> addremove <-> listening -> end.
++ # The addremove state acts as a lock against concurrent changes.
++
++ def __init__(self, devicemanager):
++ self._lock = lock = threading.Lock()
++ self._state = 'init'
++ logger.debug("UDisks: state = init")
++
++ providers.ProviderHandler.__init__(self, 'udisks')
++ self.devicemanager = devicemanager
++
++ self.bus = self.obj = self.iface = None
++ self.devices = {}
++ self.providers = {}
++
++ #~ @common.threaded
++ def connect(self):
++ assert self._state == 'init'
++ logger.debug("Connecting to UDisks")
++ try:
++ self.bus = bus = dbus.SystemBus()
++ self.obj = obj = bus.get_object('org.freedesktop.UDisks',
'/org/freedesktop/UDisks')
++ self.iface = iface = dbus.Interface(obj, 'org.freedesktop.UDisks')
++ iface.connect_to_signal('DeviceAdded', self._udisks_device_added)
++ iface.connect_to_signal('DeviceRemoved',
self._udisks_device_removed)
++ iface.connect_to_signal('DeviceChanged', self._udisks_device_added)
++ logger.info("Connected to UDisks")
++ event.log_event("hal_connected", self, None)
++ except Exception:
++ logger.warning("Failed to connect to UDisks, " \
++ "autodetection of devices will be disabled.")
++ common.log_exception()
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening")
++ self.failed = True
++ return
++ self._state = 'addremove'
++ logger.debug("UDisks: state = addremove")
++ self._add_all()
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening")
++
++ def _add_all(self):
++ assert self._state == 'addremove'
++ for path in self.iface.EnumerateDevices():
++ self._add_device(path)
++
++ def _add_device(self, path=None, obj=None):
++ """
++ Call with either path or obj (obj gets priority). Not thread-safe.
++ """
++ assert self._state == 'addremove'
++ if obj is None:
++ obj = self.bus.get_object('org.freedesktop.UDisks', path)
++
++ # In the following code, `old` and `new` are providers, while
++ # `self.devices[path]` and `device` are old/new devices. There are
++ # several possible code paths that should be correctly handled:
++ # - No old nor new provider for this path.
++ # - Provider changes (nothing to something, something to nothing,
++ # something to something else); obviously device changes as well.
++ # - Provider stays the same, but device changes (i.e. instant media-
++ # swapping; not sure it can happen).
++ # - Provider and device stay the same.
++ old, new = self._get_provider_for(obj)
++ if new is None:
++ if old is not None:
++ self.devicemanager.remove_device(self.devices[path])
++ del self.devices[path]
++ return
++ device = new.get_device(obj)
++ if new is old and device is self.devices[path]:
++ return # Exactly the same device
++ if old is not None:
++ self.devicemanager.remove_device(self.devices[path])
++ if new is None:
++ return
++ try:
++ device.autoconnect()
++ except:
++ logger.exception("Failed autoconnecting device " + str(device))
++ else:
++ self.devicemanager.add_device(device)
++ self.providers[path] = new
++ self.devices[path] = device
++
++ def _get_provider_for(self, obj):
++ """
++ Return (old_provider, old_priority), (new_provider, new_priority).
++ Not thread-safe.
++ """
++ assert self._state == 'addremove'
++ highest_prio = -1
++ highest = None
++ old = self.providers.get(obj.object_path)
++ for provider in self.get_providers():
++ priority = provider.get_priority(obj)
++ if priority is None: continue
++ # Find highest priority, preferring old provider.
++ if priority > highest_prio or \
++ (priority == highest_prio and provider is old):
++ highest_prio = priority
++ highest = provider
++ return old, highest
++
++ def _remove_device(self, path):
++ assert self._state == 'addremove'
++ try:
++ self.devicemanager.remove_device(self.devices[path])
++ del self.devices[path]
++ except KeyError:
++ logger.warning("UDisks: Can't remove device (not found): " +
path)
++
++ def _udisks_device_added(self, path):
++ logger.debug("UDisks: Device added: " + str(path))
++ if self._addremove():
++ self._add_device(path)
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening (_device_added)")
++
++ def _udisks_device_removed(self, path):
++ if self._addremove():
++ try:
++ self._remove_device(path)
++ logger.debug("UDisks: Device removed: " + str(path))
++ except KeyError: # Not ours
++ pass
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening")
++
++ # FIXME: Handle provider add/remove (following code unused & untested).
++
++ def on_provider_added(self, provider):
++ if self._addremove():
++ self._connect_all()
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening")
++
++ def on_provider_removed(self, provider):
++ if self._addremove():
++ for path, provider_ in self.providers.iteritems():
++ if provider_ is provider:
++ self._remove_device(path)
++ self._state = 'listening'
++ logger.debug("UDisks: state = listening")
++
++ def _addremove(self):
++ """
++ Helper to transition safely from listening to addremove state.
++
++ Returns whether the transition happens.
++ """
++ i = 0
++ while True:
++ with self._lock:
++ if self._state == 'listening':
++ self._state = 'addremove'
++ logger.debug("UDisks: state = addremove")
++ return True
++ # If active state is init, we sleep and try again a few times.
++ # TODO: Whose thread is this we are blocking?
++ if i == 5:
++ logger.error("UDisks: Failed to acquire lock. Ignoring device
event.")
++ return False
++ i += 1
++ time.sleep(1)
++
+ class HAL(providers.ProviderHandler):
+ """
+ HAL interface
+@@ -144,6 +321,12 @@
+ def device_from_udi(self, hal, udi):
+ pass
+
++class UDisksProvider:
++ VERY_LOW, LOW, NORMAL, HIGH, VERY_HIGH = range(0, 101, 25)
++ def get_priority(self, obj):
++ pass # return: int [0..100] or None
++ def get_device(self, obj):
++ pass # return: xl.devices.Device
++
+
+ # vim: et sts=4 sw=4
+-
+
+=== modified file 'xl/main.py'
+--- xl/main.py 2012-10-24 04:33:53 +0000
++++ xl/main.py 2012-11-09 04:25:00 +0000
+@@ -254,6 +254,8 @@
+ # Initialize HAL
+ if self.options.Hal:
+ from xl import hal
++ self.udisks = hal.UDisks(self.devices)
++ self.udisks.connect()
+ self.hal = hal.HAL(self.devices)
+ self.hal.connect()
+ else:
+
+=== modified file 'xl/trax/util.py'
+--- xl/trax/util.py 2012-10-03 04:43:15 +0000
++++ xl/trax/util.py 2012-11-09 04:25:00 +0000
+@@ -65,14 +65,17 @@
+ tracks = []
+
+ gloc = gio.File(uri)
++
+ # don't do advanced checking on streaming-type uris as it can fail or
+ # otherwise be terribly slow.
+ # TODO: move uri definition somewhere more common for easy reuse?
+-
+ if gloc.get_uri_scheme() in ('http', 'mms', 'cdda'):
+ return [Track(uri)]
+
+- file_type = gloc.query_info("standard::type").get_file_type()
++ try:
++ file_type = gloc.query_info("standard::type").get_file_type()
++ except gio.Error: # E.g. cdda
++ file_type = None
+ if file_type == gio.FILE_TYPE_DIRECTORY:
+ # TODO: refactor Library so we dont need the collection obj
+ from xl.collection import Library, Collection
+
+=== modified file 'xlgui/panel/flatplaylist.py'
+--- xlgui/panel/flatplaylist.py 2012-10-03 04:43:15 +0000
++++ xlgui/panel/flatplaylist.py 2012-11-09 04:25:00 +0000
+@@ -121,8 +121,7 @@
+ def set_playlist(self, playlist):
+ self.model.clear()
+
+- tracks = [track for track in playlist]
+- self.tracks = tracks
++ self.tracks = tracks = list(playlist)
+ 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 2fec552..c8eac3d 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,13 +1,13 @@
Summary: A music player
Name: exaile
-Version: 3.3.1
-Release: 4%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/3.3.x/3.3.1/+download/exaile-%{version}.tar.gz
+Source0:
http://launchpad.net/exaile/3.3.x/3.3.2/+download/exaile-%{version}.tar.gz
Patch0: exaile-3.3.1-makefile.patch
-Patch1: exaile-3.3.1-udisks.patch
+Patch1: exaile-3.3.2-udisks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pygobject2-devel
BuildRequires: desktop-file-utils
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Feb 21 2014 Deji Akingunola <dakingun(a)gmail.com> - 3.3.2-1
+- Update to 3.3.2
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 21b30fd..8f007e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd7ea267a9d53cdd5231912f19ae03f8 exaile-3.3.1.tar.gz
+117994e96065b4f767ac552c80808040 exaile-3.3.2.tar.gz
commit a8cb260842bf3842b643e11de184cb7aee0f77f6
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Aug 3 05:26:06 2013 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 16650e2..2fec552 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 3.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Fri Mar 08 2013 Jon Ciesla <limburgher(a)gmail.com> - 3.3.1-3
- Drop desktop vendor tag.
commit 11cae35a8965ee530b504cb4dd3957714bbf61fe
Author: Jon Ciesla <limburgher(a)gmail.com>
Date: Fri Mar 8 12:32:21 2013 -0600
Drop vendor tag.
diff --git a/exaile.spec b/exaile.spec
index 0467212..16650e2 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 3.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -50,7 +50,6 @@ rm -rf %{buildroot}
make install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} DESTDIR=%{buildroot}
PYTHON2_CMD=%{_bindir}/python
desktop-file-install --delete-original \
- --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -71,6 +70,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Mar 08 2013 Jon Ciesla <limburgher(a)gmail.com> - 3.3.1-3
+- Drop desktop vendor tag.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit f81f5194f1ecb8034cad5966045b47655b55ebdf
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 15:16:13 2013 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index fda7810..0467212 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sat Nov 17 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.1-1
- Update to 3.3.1
commit 1c0db46b777c68092814459da870725bd3df5e0c
Author: Deji Akingunola <dakingun(a)gmail.com>
Date: Sat Nov 17 07:50:49 2012 -0500
Update to 3.3.1
diff --git a/.gitignore b/.gitignore
index 36ab611..2a19c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ exaile-0.3.2.0.tar.gz
/exaile-0.3.2.1.tar.gz
/exaile-0.3.2.2.tar.gz
/exaile-3.3.0.tar.gz
+/exaile-3.3.1.tar.gz
diff --git a/exaile-3.3.0-makefile.patch b/exaile-3.3.1-makefile.patch
similarity index 70%
rename from exaile-3.3.0-makefile.patch
rename to exaile-3.3.1-makefile.patch
index 2f21c18..31e22c5 100644
--- a/exaile-3.3.0-makefile.patch
+++ b/exaile-3.3.1-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile 2012-08-30 17:58:21.000000000 -0400
-+++ Makefile.new 2012-09-24 15:52:38.751091930 -0400
+--- Makefile 2012-11-15 12:28:50.000000000 -0500
++++ Makefile.new 2012-11-17 07:33:52.334486249 -0500
@@ -5,7 +5,7 @@
XDGCONFDIR ?= /etc/xdg
@@ -18,14 +18,14 @@
${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 @@
+--- tools/generate-launcher 2012-11-15 12:28:50.000000000 -0500
++++ tools/generate-launcher.new 2012-11-17 07:27:37.237377857 -0500
+@@ -34,7 +34,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 "\$@"
+-exec ${PYTHON2_CMD} \${EXAILE_PREFIX}${LIBDIR}/exaile/exaile.py
--datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui ${DEFAULTARGS} "\$@"
++exec ${PYTHON2_CMD} ${LIBDIR}/exaile/exaile.py
--datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui ${DEFAULTARGS} "\$@"
exit \$?
EOF
diff --git a/exaile-3.3.0-udisks.patch b/exaile-3.3.1-udisks.patch
similarity index 99%
rename from exaile-3.3.0-udisks.patch
rename to exaile-3.3.1-udisks.patch
index 499c04f..ef808a7 100644
--- a/exaile-3.3.0-udisks.patch
+++ b/exaile-3.3.1-udisks.patch
@@ -66,7 +66,7 @@
--- 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 @@
+@@ -254,6 +254,8 @@
# Initialize HAL
if self.options.Hal:
from xl import hal
diff --git a/exaile.spec b/exaile.spec
index cd45ef9..fda7810 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,13 +1,13 @@
Summary: A music player
Name: exaile
-Version: 3.3.0
+Version: 3.3.1
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-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
+Source0:
http://launchpad.net/exaile/3.3.x/3.3.1/+download/exaile-%{version}.tar.gz
+Patch0: exaile-3.3.1-makefile.patch
+Patch1: exaile-3.3.1-udisks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pygobject2-devel
BuildRequires: desktop-file-utils
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Sat Nov 17 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.1-1
+- Update to 3.3.1
+
* Mon Sep 24 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.0-1
- Update to 3.3.0
diff --git a/sources b/sources
index 5d9cc6d..21b30fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e716a0f47eec5adbf28306985d79f7f exaile-3.3.0.tar.gz
+cd7ea267a9d53cdd5231912f19ae03f8 exaile-3.3.1.tar.gz
commit 1c855d8f5f6ad023ff81007b9b6e3ee7685a3eb5
Author: Deji Akingunola <dakingun(a)gmail.com>
Date: Mon Sep 24 17:59:54 2012 -0400
Prevent writing %buildroot in dbus service file
diff --git a/exaile-3.3.0-makefile.patch b/exaile-3.3.0-makefile.patch
index 97bd905..2f21c18 100644
--- a/exaile-3.3.0-makefile.patch
+++ b/exaile-3.3.0-makefile.patch
@@ -1,5 +1,5 @@
--- Makefile 2012-08-30 17:58:21.000000000 -0400
-+++ Makefile.new 2012-09-24 11:34:48.066732587 -0400
++++ Makefile.new 2012-09-24 15:52:38.751091930 -0400
@@ -5,7 +5,7 @@
XDGCONFDIR ?= /etc/xdg
@@ -9,6 +9,15 @@
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 @@
@@ -16,7 +25,7 @@
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 "\$@"
++exec ${PYTHON2_CMD} ${LIBDIR}/exaile/exaile.py
--datadir=\${EXAILE_PREFIX}/share/exaile/data --startgui "\$@"
exit \$?
EOF
diff --git a/exaile.spec b/exaile.spec
index 3b7506d..cd45ef9 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -66,7 +66,8 @@ 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
commit e1cd499bc19e6b2c276a3bdc5ba91b835b82416a
Author: Deji Akingunola <dakingun(a)gmail.com>
Date: Mon Sep 24 11:48:46 2012 -0400
Update to 3.3.0
diff --git a/.gitignore b/.gitignore
index 841caf0..36ab611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
exaile-0.3.2.0.tar.gz
/exaile-0.3.2.1.tar.gz
/exaile-0.3.2.2.tar.gz
+/exaile-3.3.0.tar.gz
diff --git a/exaile-3.3.0-makefile.patch b/exaile-3.3.0-makefile.patch
new file mode 100644
index 0000000..97bd905
--- /dev/null
+++ b/exaile-3.3.0-makefile.patch
@@ -0,0 +1,22 @@
+--- Makefile 2012-08-30 17:58:21.000000000 -0400
++++ Makefile.new 2012-09-24 11:34:48.066732587 -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
+
+--- 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-makefile.patch b/exaile-makefile.patch
deleted file mode 100644
index c315cf4..0000000
--- a/exaile-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile 2010-03-15 21:52:51.872482718 -0400
-+++ Makefile.new 2010-03-20 11:00:04.279672661 -0400
-@@ -2,7 +2,7 @@
- LIBINSTALLDIR ?= /lib
- XDGCONFDIR ?= /etc/xdg
-
--EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
-+EXAILELIBDIR = $(DESTDIR)$(LIBINSTALLDIR)/exaile
- EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
- EXAILECONFDIR = $(DESTDIR)$(XDGCONFDIR)/exaile
-
---- tools/generate-launcher 2010-04-07 16:09:52.092922850 -0400
-+++ tools/generate-launcher.new 2010-04-09 10:55:18.284684154 -0400
-@@ -30,7 +30,7 @@
- fi
- XDG_DATA_DIRS="\$EXAILE_PREFIX/share/:\$XDG_DATA_DIRS"
- export XDG_DATA_DIRS
--exec python \$EXAILE_PREFIX$LIBDIR/exaile/exaile.py
--datadir=\$EXAILE_PREFIX/share/exaile/data --startgui "\$@"
-+exec python $LIBDIR/exaile/exaile.py --datadir=\$EXAILE_PREFIX/share/exaile/data
--startgui "\$@"
- exit \$?
-
- EOF
diff --git a/exaile.spec b/exaile.spec
index b985c04..3b7506d 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,13 +1,13 @@
Summary: A music player
Name: exaile
-Version: 0.3.2.2
-Release: 4%{?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" \
@@ -71,6 +70,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Mon Sep 24 2012 Deji Akingunola <dakingun(a)gmail.com> - 3.3.0-1
+- Update to 3.3.0
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
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
commit 9da4558f5704f3e977972e0170a8ddac52fa59a4
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Jul 18 19:57:59 2012 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index fcc0641..b985c04 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.3.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit 73cc2fa26bc2bd13cc8d059e37eb03ef970dbf3e
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jan 12 20:07:20 2012 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 305a986..fcc0641 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -71,6 +71,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.2-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon Sep 12 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-2
- Place exaile's private modules in %datadir
- Trim (un-necessary?) requires
commit 2b4461d7fdfa71adc9dedf33ad74148936a190ec
Author: Deji Akingunola <dakingun(a)mail.com>
Date: Mon Sep 12 20:55:45 2011 -0400
Place exaile's private modules in %datadir
Trim (un-necessary?) requires
diff --git a/exaile.spec b/exaile.spec
index 2fb296a..305a986 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,9 +1,7 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
Summary: A music player
Name: exaile
Version: 0.3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -18,14 +16,10 @@ BuildRequires: gettext help2man
Requires: python-mutagen >= 1.8
Requires: dbus-python
Requires: gstreamer-python >= 0.10
-Requires: python-sqlite2
Requires: pygtk2
Requires: pygtk2-libglade
-#Requires: gnome-python2-gtkhtml2
Requires: python-inotify
Requires: python-CDDB
-Requires: python-sexy
-Requires: gamin-python
Requires: udisks
BuildArch: noarch
@@ -54,7 +48,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make install PREFIX=%{_prefix} LIBINSTALLDIR=%{python_sitelib} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBINSTALLDIR=%{_datadir} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
@@ -75,9 +69,12 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%{_sysconfdir}/xdg/exaile/
%{_mandir}/man1/exaile*.*
-%{python_sitelib}/exaile/
%changelog
+* Mon Sep 12 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-2
+- Place exaile's private modules in %datadir
+- Trim (un-necessary?) requires
+
* Wed Aug 31 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-1
- Update to 0.3.2.2
- Drop hal. Apply patch to support udisk from upstream bzr's udisk branch
commit fd89ea177bc2ec4754bc4adc72ed994452f4897b
Author: Deji Akingunola <dakingun(a)mail.com>
Date: Thu Sep 1 23:29:53 2011 -0400
Update to 0.3.2.2
Drop hal. Apply patch to support udisk from upstream bzr's udisk branch
diff --git a/.gitignore b/.gitignore
index 1d78859..841caf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
exaile-0.3.2.0.tar.gz
/exaile-0.3.2.1.tar.gz
+/exaile-0.3.2.2.tar.gz
diff --git a/exaile-udisks.patch b/exaile-udisks.patch
new file mode 100644
index 0000000..cc776fa
--- /dev/null
+++ b/exaile-udisks.patch
@@ -0,0 +1,253 @@
+--- plugins/cd/__init__.py 2011-07-18 20:32:50.690850000 -0400
++++ plugins/cd/__init__.py.new 2011-08-31 13:41:50.277924078 -0400
+@@ -27,12 +27,12 @@
+
+ from xl.nls import gettext as _
+ from xl import providers, event
+-from xl.hal import Handler
++from xl.hal import Handler, UDisksProvider
+ from xl.devices import Device
+ import logging
+ logger = logging.getLogger(__name__)
+
+-PROVIDER = None
++PROVIDER = PROVIDER_UDISKS = None
+
+ import dbus, threading, os, struct
+ from fcntl import ioctl
+@@ -61,15 +61,17 @@
+ CDROM_DATA_TRACK = 0x04
+
+ def enable(exaile):
+- global PROVIDER
+- PROVIDER = CDHandler()
+- providers.register("hal", PROVIDER)
+-
++ global PROVIDER, PROVIDER_UDISKS
++ #~ PROVIDER = CDHandler()
++ #~ providers.register("hal", PROVIDER)
++ PROVIDER_UDISKS = UDisksCdProvider()
++ providers.register("udisks", PROVIDER_UDISKS)
+
+ def disable(exaile):
+- global PROVIDER
++ global PROVIDER, PROVIDER_UDISKS
+ providers.unregister("hal", PROVIDER)
+- PROVIDER = None
++ providers.unregister("udisks", PROVIDER_UDISKS)
++ PROVIDER = PROVIDER_UDISKS = None
+
+ 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
+
++class UDisksCdProvider(UDisksProvider):
++ PRIORITY = UDisksProvider.NORMAL
++
++ name = 'cd'
++
++ def get_priority(self, obj):
++ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
++ iface = 'org.freedesktop.UDisks.Device'
++ # XXX: We use the number of audio tracks to identify audio CDs.
++ # There may be a better way....
++ compat = props.Get(iface, 'DriveMediaCompatibility')
++ return self.PRIORITY if 'optical_cd' in compat else None
++
++ def create_device(self, obj):
++ props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
++ iface = 'org.freedesktop.UDisks.Device'
++ return CDDevice(dev=props.Get(iface, 'DeviceFile'))
++
+
+ # 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 @@
+ # Initialize HAL
+ if self.options.Hal:
+ from xl import hal
++ self.udisks = hal.UDisks(self.devices)
++ self.udisks.connect()
+ self.hal = hal.HAL(self.devices)
+ self.hal.connect()
+ else:
+--- xl/hal.py 2011-07-18 20:32:50.690850000 -0400
++++ xl/hal.py.new 2011-08-31 13:49:02.489520690 -0400
+@@ -24,7 +24,7 @@
+ # do so. If you do not wish to do so, delete this exception statement
+ # from your version.
+
+-import logging
++import logging, threading, time
+ import dbus
+
+ from xl import common, providers, event, devices, settings
+@@ -32,6 +32,120 @@
+
+ logger = logging.getLogger(__name__)
+
++class UDisks(providers.ProviderHandler):
++ """Provides support for UDisks devices.
++
++ If the D-Bus connection fails, this object will grow a "failed" attribute
++ with True as the value. Plugins should check for this attribute when
++ registering if they want to provide HAL fallback. FIXME: There's a race
++ condition here.
++ """
++
++ # States: start -> init -> addremove <-> listening -> end.
++ # The addremove state acts as a lock against concurrent changes.
++
++ def __init__(self, devicemanager):
++ self._lock = lock = threading.Lock()
++ self._state = 'init'
++
++ providers.ProviderHandler.__init__(self, 'udisks')
++ self.devicemanager = devicemanager
++
++ self.bus = self.obj = self.iface = None
++ self.devices = {}
++ self.providers = {}
++
++ @common.threaded
++ def connect(self):
++ assert self._state == 'init'
++ logger.debug("Connecting to UDisks")
++ try:
++ self.bus = bus = dbus.SystemBus()
++ self.obj = obj = bus.get_object('org.freedesktop.UDisks',
'/org/freedesktop/UDisks')
++ self.iface = iface = dbus.Interface(obj, 'org.freedesktop.UDisks')
++ iface.connect_to_signal('DeviceAdded', self._device_added,
path_keyword='path')
++ iface.connect_to_signal('DeviceRemoved', self._device_removed,
path_keyword='path')
++ logger.info("Connected to UDisks")
++ event.log_event("hal_connected", self, None)
++ except Exception:
++ logger.warning("Failed to connect to UDisks, " \
++ "autodetection of devices will be disabled.")
++ self._state = 'listening'
++ self.failed = True
++ return
++ self._state = 'addremove'
++ self._add_all()
++ self._state = 'listening'
++
++ def _add_all(self):
++ assert self._state == 'addremove'
++ for path in self.iface.EnumerateDevices():
++ self._add_path(path)
++
++ def _add_path(self, path):
++ assert self._state == 'addremove'
++ obj = self.bus.get_object('org.freedesktop.UDisks', path)
++ old, new = self._get_provider_for(obj)
++ if new is not old:
++ if old[0]:
++ self.devicemanager.remove_device(self.devices[path])
++ device = new[0].create_device(obj)
++ device.autoconnect()
++ self.devicemanager.add_device(device)
++ self.providers[path] = new
++ self.devices[path] = device
++
++ def _get_provider_for(self, obj):
++ """Return (old_provider, old_priority), (new_provider,
new_priority)"""
++ assert self._state == 'addremove'
++ path = obj.object_path
++ highest = old = self.providers.get(path, (None, -1))
++ for provider in self.get_providers():
++ priority = provider.get_priority(obj)
++ if priority is not None and priority > highest[1]:
++ highest = (provider, priority)
++ return old, highest
++
++ def _remove_path(self, path):
++ assert self._state == 'addremove'
++ self.devicemanager.remove_device(self.devices[path])
++ del self.devices[path]
++
++ def _device_added(self, path):
++ import pdb; pdb.set_trace()
++ self._addremove()
++ self._add_path(path)
++ self._state = 'listening'
++
++ def _device_removed(self, path):
++ self._addremove()
++ try:
++ self._remove_path(path)
++ except KeyError: # Not ours
++ pass
++ self._state = 'listening'
++
++ def on_provider_added(self, provider):
++ self._addremove()
++ self._connect_all()
++ self._state = 'listening'
++
++ def on_provider_removed(self, provider):
++ self._addremove()
++ for path, provider_ in self.providers.iteritems():
++ if provider_ is provider:
++ self._remove_path(path)
++ self._state = 'listening'
++
++ def _addremove(self):
++ """Helper to transition safely to the addremove
state"""
++ while True:
++ with self._lock:
++ if self._state == 'listening':
++ self._state = 'addremove'
++ break
++ time.sleep(1)
++
+ class HAL(providers.ProviderHandler):
+ """
+ HAL interface
+@@ -144,6 +258,13 @@
+ def device_from_udi(self, hal, udi):
+ pass
+
++class UDisksProvider:
++ VERY_LOW, LOW, NORMAL, HIGH, VERY_HIGH = range(0, 101, 25)
++ def get_priority(self, obj):
++ pass # return: int [0..100] or None
++ def get_device(self, obj):
++ pass # return: xl.devices.Device
++
+
+ # 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 f517853..2fb296a 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,13 +2,14 @@
Summary: A music player
Name: exaile
-Version: 0.3.2.1
+Version: 0.3.2.2
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/0.3.2/0.3.2.1/+download/exaile-%{version}.tar.gz
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pygobject2-devel
BuildRequires: desktop-file-utils
@@ -25,7 +26,7 @@ Requires: python-inotify
Requires: python-CDDB
Requires: python-sexy
Requires: gamin-python
-Requires: hal
+Requires: udisks
BuildArch: noarch
@@ -45,6 +46,7 @@ on your iPod to last.fm
%prep
%setup -q
%patch0 -p0 -b .fix
+%patch1 -p0 -b .udisk
%build
make %{?_smp_mflags}
@@ -76,6 +78,10 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Wed Aug 31 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.2-1
+- Update to 0.3.2.2
+- Drop hal. Apply patch to support udisk from upstream bzr's udisk branch
+
* Thu Mar 03 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.1-1
- Update to 0.3.2.1
diff --git a/sources b/sources
index 8d46f94..17cb347 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ecfa9e52a9f2882717b3483518b604b exaile-0.3.2.1.tar.gz
+b3fd87e40af6592df0b511183ca49408 exaile-0.3.2.2.tar.gz
commit 32feff2ab727a7c49da28f1f86f54d9bd3f5c430
Author: Deji Akingunola <dakingun(a)gmail.com>
Date: Thu Mar 3 12:11:02 2011 -0500
Update to 0.3.2.1
diff --git a/.gitignore b/.gitignore
index efbf3c3..1d78859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
exaile-0.3.2.0.tar.gz
+/exaile-0.3.2.1.tar.gz
diff --git a/exaile.spec b/exaile.spec
index d4e9d95..f517853 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,18 +2,17 @@
Summary: A music player
Name: exaile
-Version: 0.3.2.0
-Release: 3%{?dist}
+Version: 0.3.2.1
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/0.3.2/0.3.2.0/+download/exaile-%{version}.tar.gz
+Source0:
http://launchpad.net/exaile/0.3.2/0.3.2.1/+download/exaile-%{version}.tar.gz
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel pygobject2-devel
+BuildRequires: pygobject2-devel
BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig
-BuildRequires: gettext intltool perl(XML::Parser) help2man
+BuildRequires: gettext help2man
Requires: python-mutagen >= 1.8
Requires: dbus-python
@@ -77,6 +76,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Thu Mar 03 2011 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.1-1
+- Update to 0.3.2.1
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.0-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 2d773c1..8d46f94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdd1f75118032a5aa0932cb449b2c533 exaile-0.3.2.0.tar.gz
+7ecfa9e52a9f2882717b3483518b604b exaile-0.3.2.1.tar.gz
commit f449be4af068b9b290c79a9841409f1ef334ace2
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Feb 8 12:55:48 2011 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 4043c63..d4e9d95 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,7 +3,7 @@
Summary: A music player
Name: exaile
Version: 0.3.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.2.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.3.2.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
commit d3e4ed3ae66688ed8d2d653a464903bbcdc4f151
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Wed Jul 28 14:07:09 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 659585d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: exaile
-# $Id: Makefile,v 1.1 2006/12/29 05:53:52 deji Exp $
-NAME := exaile
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 22f2f36b4a0ac59cb352881385f4eb01d291ce9c
Author: dmalcolm <dmalcolm(a)fedoraproject.org>
Date: Thu Jul 22 01:17:28 2010 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/exaile.spec b/exaile.spec
index eb98b22..4043c63 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,7 +3,7 @@
Summary: A music player
Name: exaile
Version: 0.3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
@@ -77,6 +77,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 0.3.2.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
* Mon Jun 28 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.0-1
- Update to 0.3.2.0
commit 2d1b505f69be04fd07f962e2f6ad32b58b99e18a
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Mon Jun 28 17:34:24 2010 +0000
- Update to 0.3.2.0
diff --git a/.cvsignore b/.cvsignore
index a42dadf..efbf3c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.1.2.tar.gz
+exaile-0.3.2.0.tar.gz
diff --git a/exaile.spec b/exaile.spec
index 7cafbb9..eb98b22 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,18 +2,18 @@
Summary: A music player
Name: exaile
-Version: 0.3.1.2
+Version: 0.3.2.0
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/0.3.1/0.3.1.1/+download/exaile-%{version}.tar.gz
+Source0:
http://launchpad.net/exaile/0.3.2/0.3.2.0/+download/exaile-%{version}.tar.gz
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel
+BuildRequires: python-devel pygobject2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
-BuildRequires: gettext intltool perl(XML::Parser)
+BuildRequires: gettext intltool perl(XML::Parser) help2man
Requires: python-mutagen >= 1.8
Requires: dbus-python
@@ -73,10 +73,14 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
%{_sysconfdir}/xdg/exaile/
+%{_mandir}/man1/exaile*.*
%{python_sitelib}/exaile/
%changelog
-* Wed Jun 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
+* Mon Jun 28 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.2.0-1
+- Update to 0.3.2.0
+
+* Wed Jun 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.2-1
- Update to 0.3.1.2
* Fri Apr 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
diff --git a/sources b/sources
index befe82e..2d773c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4f80d3a10631b28485be22cd296a450 exaile-0.3.1.2.tar.gz
+fdd1f75118032a5aa0932cb449b2c533 exaile-0.3.2.0.tar.gz
commit 4be353857eeead49617d1566eebb063ae395c539
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Jun 2 15:35:27 2010 +0000
- Update to 0.3.1.2
diff --git a/.cvsignore b/.cvsignore
index b1cd750..a42dadf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.1.1.tar.gz
+exaile-0.3.1.2.tar.gz
diff --git a/exaile.spec b/exaile.spec
index 44b07cc..7cafbb9 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,7 +2,7 @@
Summary: A music player
Name: exaile
-Version: 0.3.1.1
+Version: 0.3.1.2
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Wed Jun 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
+- Update to 0.3.1.2
+
* Fri Apr 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
- Update to 0.3.1.1
diff --git a/sources b/sources
index fc60c33..befe82e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f0e6ce72249027d69653456a0707c57 exaile-0.3.1.1.tar.gz
+e4f80d3a10631b28485be22cd296a450 exaile-0.3.1.2.tar.gz
commit ada90c2b21589ff6f240d3b0951e299517d2d7a0
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Apr 9 15:23:25 2010 +0000
- Update to 0.3.1.1
diff --git a/.cvsignore b/.cvsignore
index f7299af..b1cd750 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.1.0.tar.gz
+exaile-0.3.1.1.tar.gz
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
index c19b4e3..c315cf4 100644
--- a/exaile-makefile.patch
+++ b/exaile-makefile.patch
@@ -9,14 +9,14 @@
EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
EXAILECONFDIR = $(DESTDIR)$(XDGCONFDIR)/exaile
---- tools/generate-launcher 2010-03-15 21:52:51.882481251 -0400
-+++ tools/generate-launcher.new 2010-03-20 11:22:11.822431286 -0400
-@@ -28,7 +28,7 @@
+--- tools/generate-launcher 2010-04-07 16:09:52.092922850 -0400
++++ tools/generate-launcher.new 2010-04-09 10:55:18.284684154 -0400
+@@ -30,7 +30,7 @@
fi
XDG_DATA_DIRS="\$EXAILE_PREFIX/share/:\$XDG_DATA_DIRS"
export XDG_DATA_DIRS
--exec python \$EXAILE_PREFIX$LIBDIR/exaile/exaile.py
--datadir=\$EXAILE_PREFIX/share/exaile/data --startgui \$@
-+exec python $LIBDIR/exaile/exaile.py --datadir=\$EXAILE_PREFIX/share/exaile/data
--startgui \$@
+-exec python \$EXAILE_PREFIX$LIBDIR/exaile/exaile.py
--datadir=\$EXAILE_PREFIX/share/exaile/data --startgui "\$@"
++exec python $LIBDIR/exaile/exaile.py --datadir=\$EXAILE_PREFIX/share/exaile/data
--startgui "\$@"
exit \$?
EOF
diff --git a/exaile.spec b/exaile.spec
index 053d4df..44b07cc 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,12 +2,12 @@
Summary: A music player
Name: exaile
-Version: 0.3.1.0
+Version: 0.3.1.1
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://launchpad.net/exaile/0.3.1/0.3.1/+download/exaile-%{version}.tar.gz
+Source0:
http://launchpad.net/exaile/0.3.1/0.3.1.1/+download/exaile-%{version}.tar.gz
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Fri Apr 09 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.1-1
+- Update to 0.3.1.1
+
* Sat Mar 20 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.0-1
- Update to 0.3.1.0
diff --git a/sources b/sources
index a3f1e1f..fc60c33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9554ee9bb49af3d1b3a8570e51a27da exaile-0.3.1.0.tar.gz
+4f0e6ce72249027d69653456a0707c57 exaile-0.3.1.1.tar.gz
commit 561e45aaefd93e1861a3191255dfd1891e20efe6
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Sat Mar 20 15:41:43 2010 +0000
- Update to 0.3.1.0
diff --git a/.cvsignore b/.cvsignore
index 60e79e3..f7299af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.0.2.tar.gz
+exaile-0.3.1.0.tar.gz
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
index 779be1b..c19b4e3 100644
--- a/exaile-makefile.patch
+++ b/exaile-makefile.patch
@@ -1,20 +1,22 @@
---- Makefile 2009-09-06 19:45:01.161376822 -0400
-+++ Makefile.new 2009-09-30 10:42:46.877746915 -0400
+--- Makefile 2010-03-15 21:52:51.872482718 -0400
++++ Makefile.new 2010-03-20 11:00:04.279672661 -0400
@@ -2,7 +2,7 @@
- LIBINSTALLDIR ?= /lib
- XDGCONFDIR ?= /etc/xdg
+ LIBINSTALLDIR ?= /lib
+ XDGCONFDIR ?= /etc/xdg
--EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
-+EXAILELIBDIR = $(DESTDIR)$(LIBINSTALLDIR)/exaile
- EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
+-EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
++EXAILELIBDIR = $(DESTDIR)$(LIBINSTALLDIR)/exaile
+ EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
+ EXAILECONFDIR = $(DESTDIR)$(XDGCONFDIR)/exaile
- all: compile
-@@ -83,7 +83,7 @@
- # the printf here is for bsd compat, dont use echo!
- cd $(DESTDIR)$(PREFIX)/bin && \
- printf "#!/bin/sh\n\
-- exec python $(PREFIX)$(LIBINSTALLDIR)/exaile/exaile.py \
-+ exec python $(LIBINSTALLDIR)/exaile/exaile.py \
- --datadir=$(PREFIX)/share/exaile/data --startgui \"\$$@\"" \
- > exaile && \
- chmod 755 exaile
+--- tools/generate-launcher 2010-03-15 21:52:51.882481251 -0400
++++ tools/generate-launcher.new 2010-03-20 11:22:11.822431286 -0400
+@@ -28,7 +28,7 @@
+ fi
+ XDG_DATA_DIRS="\$EXAILE_PREFIX/share/:\$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS
+-exec python \$EXAILE_PREFIX$LIBDIR/exaile/exaile.py
--datadir=\$EXAILE_PREFIX/share/exaile/data --startgui \$@
++exec python $LIBDIR/exaile/exaile.py --datadir=\$EXAILE_PREFIX/share/exaile/data
--startgui \$@
+ exit \$?
+
+ EOF
diff --git a/exaile.spec b/exaile.spec
index adcf6a2..053d4df 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,19 +2,17 @@
Summary: A music player
Name: exaile
-Version: 0.3.0.2
+Version: 0.3.1.0
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://www.launchpad.net/exaile/0.3.0/0.3.0.2/+download/exaile-%{version}...
+Source0:
http://launchpad.net/exaile/0.3.1/0.3.1/+download/exaile-%{version}.tar.gz
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
-#BuildRequires: pygtk2-devel
-#BuildRequires: sphinx
BuildRequires: gettext intltool perl(XML::Parser)
Requires: python-mutagen >= 1.8
@@ -71,7 +69,6 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/exaile
-#%{_libdir}/exaile/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
@@ -79,6 +76,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Sat Mar 20 2010 Deji Akingunola <dakingun(a)gmail.com> - 0.3.1.0-1
+- Update to 0.3.1.0
+
* Wed Nov 25 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.2-1
- Update to 0.3.0.2
diff --git a/sources b/sources
index 10d9269..a3f1e1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6036291d14e0b77834e60bb6492ed3cc exaile-0.3.0.2.tar.gz
+e9554ee9bb49af3d1b3a8570e51a27da exaile-0.3.1.0.tar.gz
commit 06fae4e945b37f53259567c0e3f520dd66162364
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Thu Nov 26 04:20:48 2009 +0000
- Update to 0.3.0.2
diff --git a/.cvsignore b/.cvsignore
index d9fa28d..60e79e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.0.1.tar.gz
+exaile-0.3.0.2.tar.gz
diff --git a/exaile.spec b/exaile.spec
index e9b4d6f..adcf6a2 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,12 +2,12 @@
Summary: A music player
Name: exaile
-Version: 0.3.0.1
+Version: 0.3.0.2
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://www.launchpad.net/exaile/0.3.0/0.3.0/+download/exaile-%{version}.t...
+Source0:
http://www.launchpad.net/exaile/0.3.0/0.3.0.2/+download/exaile-%{version}...
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Wed Nov 25 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.2-1
+- Update to 0.3.0.2
+
* Wed Sep 30 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.1-1
- Update to 0.3.0.1
diff --git a/sources b/sources
index ef4bd0b..10d9269 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6bd14cea747a808570b304e647544f1 exaile-0.3.0.1.tar.gz
+6036291d14e0b77834e60bb6492ed3cc exaile-0.3.0.2.tar.gz
commit b795791072976a23eca45b8a7a8e2c236e14199d
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 22:50:05 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index e517914..659585d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: exaile
-# $Id$
+# $Id: Makefile,v 1.1 2006/12/29 05:53:52 deji Exp $
NAME := exaile
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 1c1ddd95bd85d5f19259e94a706105f9a03f8f3f
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Sep 30 15:25:07 2009 +0000
- Update to 0.3.0.1
diff --git a/.cvsignore b/.cvsignore
index 59d2952..d9fa28d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile-0.3.0.tar.gz
+exaile-0.3.0.1.tar.gz
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
index 76459e3..779be1b 100644
--- a/exaile-makefile.patch
+++ b/exaile-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile 2009-08-24 17:25:03.000000000 -0400
-+++ Makefile.new 2009-08-28 19:46:25.227288689 -0400
+--- Makefile 2009-09-06 19:45:01.161376822 -0400
++++ Makefile.new 2009-09-30 10:42:46.877746915 -0400
@@ -2,7 +2,7 @@
LIBINSTALLDIR ?= /lib
XDGCONFDIR ?= /etc/xdg
@@ -9,7 +9,7 @@
EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
all: compile
-@@ -87,7 +87,7 @@
+@@ -83,7 +83,7 @@
# the printf here is for bsd compat, dont use echo!
cd $(DESTDIR)$(PREFIX)/bin && \
printf "#!/bin/sh\n\
diff --git a/exaile.spec b/exaile.spec
index 8c7aadf..e9b4d6f 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,7 +2,7 @@
Summary: A music player
Name: exaile
-Version: 0.3.0
+Version: 0.3.0.1
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPLv2+
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
%{python_sitelib}/exaile/
%changelog
+* Wed Sep 30 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0.1-1
+- Update to 0.3.0.1
+
* Fri Aug 28 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0-1
- Update to 0.3.0
diff --git a/sources b/sources
index b44cb92..ef4bd0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d89110396b088042f39677892829e2d exaile-0.3.0.tar.gz
+c6bd14cea747a808570b304e647544f1 exaile-0.3.0.1.tar.gz
commit 29e9dbf4ba4520cd65dda4f151b71323e3e8c288
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Sat Aug 29 22:46:31 2009 +0000
- Update to 0.3.0
diff --git a/.cvsignore b/.cvsignore
index c733cac..59d2952 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.14.tar.gz
+exaile-0.3.0.tar.gz
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
index 6352e5e..76459e3 100644
--- a/exaile-makefile.patch
+++ b/exaile-makefile.patch
@@ -1,84 +1,20 @@
---- Makefile 2008-02-28 11:17:05.000000000 -0500
-+++ Makefile.new 2008-02-28 11:29:09.000000000 -0500
-@@ -18,14 +18,14 @@
+--- Makefile 2009-08-24 17:25:03.000000000 -0400
++++ Makefile.new 2009-08-28 19:46:25.227288689 -0400
+@@ -2,7 +2,7 @@
+ LIBINSTALLDIR ?= /lib
+ XDGCONFDIR ?= /etc/xdg
- make-install-dirs:
- mkdir -p $(DESTDIR)$(PREFIX)/bin
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
-- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
-+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/lib
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
- mkdir -p $(DESTDIR)$(PREFIX)/share/
- mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
- mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-@@ -41,26 +41,26 @@
+-EXAILELIBDIR = $(DESTDIR)$(PREFIX)$(LIBINSTALLDIR)/exaile
++EXAILELIBDIR = $(DESTDIR)$(LIBINSTALLDIR)/exaile
+ EXAILESHAREDIR = $(DESTDIR)$(PREFIX)/share/exaile
- install: make-install-dirs
- install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
-- install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+ install -m 644 exaile.py $(DESTDIR)$(LIBDIR)/exaile
- install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
- install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
- install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql
-- -install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+ -install -m 644 mmkeys.so $(DESTDIR)$(LIBDIR)/exaile
- install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images
- install -m 644 images/default_theme/*.png \
- $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme
-- install -m 644 xl/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
-- -install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
-- install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
-- -install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
-- install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
-- -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
-- install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
-- -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
-- install -m 644 lib/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
-- -install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
-+ install -m 644 xl/*.py $(DESTDIR)$(LIBDIR)/exaile/xl
-+ -install -m 644 xl/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl
-+ install -m 644 xl/media/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+ -install -m 644 xl/media/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/media
-+ install -m 644 xl/panels/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+ -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/panels
-+ install -m 644 xl/gui/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+ -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/gui
-+ install -m 644 lib/*.py $(DESTDIR)$(LIBDIR)/exaile/lib
-+ -install -m 644 lib/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/lib
- install -m 644 data/*.ini $(DESTDIR)$(PREFIX)/share/exaile/data
-- install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
-+ install -m 644 xl/plugins/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
- install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
- install -m 644 images/largeicon.png \
- $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
-@@ -69,7 +69,8 @@
- /bin/echo -e \
- "#!/bin/sh\n" \
- "cd $(PREFIX)/share/exaile\n" \
-- "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
-+ "export MOZILLA_FIVE_HOME=\`cat $(GRE_CONF_PATH) | grep GRE_PATH | sed -e
's/GRE_PATH=//'\`\n" \
-+ "exec python $(LIBDIR)/exaile/exaile.py \"\$$@\"" \
- > exaile && \
- chmod 755 exaile
- for f in `find po -name exaile.mo` ; do \
-@@ -92,7 +93,7 @@
-
- uninstall:
- rm -rf $(DESTDIR)$(PREFIX)/share/exaile
-- rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
-+ rm -rf $(DESTDIR)$(LIBDIR)/exaile
- rm -rf $(DESTDIR)$(PREFIX)/bin/exaile
- rm -f $(DESTDIR)$(PREFIX)/share/applications/exaile.desktop
- rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
+ all: compile
+@@ -87,7 +87,7 @@
+ # the printf here is for bsd compat, dont use echo!
+ cd $(DESTDIR)$(PREFIX)/bin && \
+ printf "#!/bin/sh\n\
+- exec python $(PREFIX)$(LIBINSTALLDIR)/exaile/exaile.py \
++ exec python $(LIBINSTALLDIR)/exaile/exaile.py \
+ --datadir=$(PREFIX)/share/exaile/data --startgui \"\$$@\"" \
+ > exaile && \
+ chmod 755 exaile
diff --git a/exaile.spec b/exaile.spec
index 5c3ddb9..8c7aadf 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,43 +1,36 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
Summary: A music player
Name: exaile
-Version: 0.2.14
-Release: 4%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Group: Applications/Multimedia
-# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
-License: GPL+ or Artistic
+License: GPLv2+
URL:
http://www.exaile.org
-Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
+Source0:
http://www.launchpad.net/exaile/0.3.0/0.3.0/+download/exaile-%{version}.t...
Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
-BuildRequires: pygtk2-devel
-BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
-#BuildRequires: gecko-devel
+#BuildRequires: pygtk2-devel
+#BuildRequires: sphinx
BuildRequires: gettext intltool perl(XML::Parser)
Requires: python-mutagen >= 1.8
Requires: dbus-python
Requires: gstreamer-python >= 0.10
Requires: python-sqlite2
+Requires: pygtk2
Requires: pygtk2-libglade
-Requires: gnome-python2-gtkhtml2
-Requires: gnome-python2-gtkmozembed
+#Requires: gnome-python2-gtkhtml2
+Requires: python-inotify
Requires: python-CDDB
Requires: python-sexy
Requires: gamin-python
+Requires: hal
-%if 0%{?fedora} > 6
-# for iPod device support
-Requires: python-gpod
-%endif
-
-%ifarch x86_64 ia64 ppc64 s390x sparc64
-%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
-%else
-%define gre_conf %{_sysconfdir}/gre.d/gre.conf
-%endif
+BuildArch: noarch
%description
Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
@@ -56,25 +49,19 @@ on your iPod to last.fm
%setup -q
%patch0 -p0 -b .fix
-# remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i plugins/*.py xl/plugins/*.py xl/*.py exaile.py
-
%build
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make install PREFIX=%{_prefix} LIBDIR=%{_libdir} \
- GRE_CONF_PATH=%{gre_conf} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBINSTALLDIR=%{python_sitelib} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so
-
%find_lang %{name}
%clean
@@ -82,15 +69,19 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc changelog COPYING
+%doc COPYING
%{_bindir}/exaile
-%{_libdir}/exaile/
+#%{_libdir}/exaile/
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
-%{_mandir}/man1/exaile*.*
+%{_sysconfdir}/xdg/exaile/
+%{python_sitelib}/exaile/
%changelog
+* Fri Aug 28 2009 Deji Akingunola <dakingun(a)gmail.com> - 0.3.0-1
+- Update to 0.3.0
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index b85ff08..b44cb92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e569c084134abe13d651f804812b6fa exaile_0.2.14.tar.gz
+8d89110396b088042f39677892829e2d exaile-0.3.0.tar.gz
commit b55ccd1d5f4aa143198433eb57cb7ca2c6f196bd
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Fri Jul 24 22:24:42 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index a917595..5c3ddb9 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.14
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
License: GPL+ or Artistic
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit 6469c865de0cf7bc641b7bde2bc0fb35f82df345
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 24 15:48:00 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/exaile.spec b/exaile.spec
index 267e9cb..a917595 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
License: GPL+ or Artistic
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.14-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 0.2.14-2
- Rebuild for Python 2.6
commit b64a2c41a4968826fa5c20c7eb628c8143aa6daf
Author: Ignacio Vazquez-Abrams <ivazquez(a)fedoraproject.org>
Date: Mon Dec 1 05:03:46 2008 +0000
Rebuild for Python 2.6
diff --git a/exaile.spec b/exaile.spec
index 25cd678..267e9cb 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
License: GPL+ or Artistic
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 0.2.14-2
+- Rebuild for Python 2.6
+
* Thu Oct 09 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.14-1
- Update to 0.2.14
commit 7974f0cb89c13598f5c888fe2d859894d22b0b42
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Thu Oct 9 05:21:16 2008 +0000
- Update to 0.2.14
diff --git a/.cvsignore b/.cvsignore
index 67e15f8..c733cac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.13.tar.gz
+exaile_0.2.14.tar.gz
diff --git a/exaile.spec b/exaile.spec
index ba0eb02..25cd678 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
-Version: 0.2.13
-Release: 3%{?dist}
+Version: 0.2.14
+Release: 1%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
License: GPL+ or Artistic
@@ -53,7 +53,7 @@ downloading of guitar tablature from
fretplay.com, and submitting played
tracks
on your iPod to last.fm
%prep
-%setup -q -n exaile_%{version}
+%setup -q
%patch0 -p0 -b .fix
# remove shebangs from all files as none should be executable scripts
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Thu Oct 09 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.14-1
+- Update to 0.2.14
+
* Fri Jul 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-3
- fix license tag
diff --git a/sources b/sources
index 63aae7e..b85ff08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3caf9381691274a9de1fda203c43fb4f exaile_0.2.13.tar.gz
+5e569c084134abe13d651f804812b6fa exaile_0.2.14.tar.gz
commit 1b723c503f35915445d7b6282deb4773402a0f09
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Jul 11 17:44:52 2008 +0000
fix license tag
diff --git a/exaile.spec b/exaile.spec
index 80dde0e..ba0eb02 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,10 +1,10 @@
Summary: A music player
Name: exaile
Version: 0.2.13
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
-# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
-License: GPL+ and Artistic
+# It actually says GPL 1 or later version; one file says "Artistic/Perl", which
is GPL+ or Artistic.
+License: GPL+ or Artistic
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
Patch0: exaile-makefile.patch
@@ -91,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Jul 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-3
+- fix license tag
+
* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-2
- fix conditional comparison
- add sparc64 to 64bit arch check
commit b1297d99fb44c26413aa636f2c627a0217a54b94
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Jul 7 17:22:10 2008 +0000
fix conditional comparison
diff --git a/exaile.spec b/exaile.spec
index e7fe816..80dde0e 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPL+ and Artistic
@@ -28,12 +28,12 @@ Requires: python-CDDB
Requires: python-sexy
Requires: gamin-python
-%if "%fedora" > "6"
+%if 0%{?fedora} > 6
# for iPod device support
Requires: python-gpod
%endif
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
%else
%define gre_conf %{_sysconfdir}/gre.d/gre.conf
@@ -91,6 +91,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Mon Jul 07 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.2.13-2
+- fix conditional comparison
+- add sparc64 to 64bit arch check
+
* Wed Apr 02 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.13-1
- Update to 0.2.13
commit 966dcc8966cb145769bc6e5fcd124c8587b4d83b
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Apr 2 14:05:11 2008 +0000
Fix File list
diff --git a/exaile.spec b/exaile.spec
index bb5a88d..e7fe816 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -82,7 +82,7 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc changelog COPYING TODO
+%doc changelog COPYING
%{_bindir}/exaile
%{_libdir}/exaile/
%{_datadir}/applications/*.desktop
commit 6d6b3cc6b49488a6187fcfa3fed7abf867dfa9a4
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Apr 2 13:43:10 2008 +0000
- Update to 0.2.13
diff --git a/.cvsignore b/.cvsignore
index 7b31755..67e15f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.11.1.tar.gz
+exaile_0.2.13.tar.gz
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
index 175faa0..6352e5e 100644
--- a/exaile-makefile.patch
+++ b/exaile-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile 2007-10-02 12:25:55.000000000 -0400
-+++ Makefile-new 2007-10-22 23:41:13.000000000 -0400
+--- Makefile 2008-02-28 11:17:05.000000000 -0500
++++ Makefile.new 2008-02-28 11:29:09.000000000 -0500
@@ -18,14 +18,14 @@
make-install-dirs:
@@ -63,16 +63,17 @@
install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
install -m 644 images/largeicon.png \
$(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
-@@ -71,7 +71,7 @@
+@@ -69,7 +69,8 @@
+ /bin/echo -e \
+ "#!/bin/sh\n" \
"cd $(PREFIX)/share/exaile\n" \
- "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \
- "export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \
- "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
++ "export MOZILLA_FIVE_HOME=\`cat $(GRE_CONF_PATH) | grep GRE_PATH | sed -e
's/GRE_PATH=//'\`\n" \
+ "exec python $(LIBDIR)/exaile/exaile.py \"\$$@\"" \
exaile && \
chmod 755 exaile
for f in `find po -name exaile.mo` ; do \
-@@ -91,7 +91,7 @@
+@@ -92,7 +93,7 @@
uninstall:
rm -rf $(DESTDIR)$(PREFIX)/share/exaile
diff --git a/exaile.spec b/exaile.spec
index fbb26e8..bb5a88d 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,9 +1,7 @@
-%define firefox_lib %(pkg-config --variable=libdir firefox-gtkmozembed)
-
Summary: A music player
Name: exaile
-Version: 0.2.11.1
-Release: 2%{?dist}
+Version: 0.2.13
+Release: 1%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPL+ and Artistic
@@ -16,7 +14,7 @@ BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
-BuildRequires: gecko-devel
+#BuildRequires: gecko-devel
BuildRequires: gettext intltool perl(XML::Parser)
Requires: python-mutagen >= 1.8
@@ -35,6 +33,12 @@ Requires: gamin-python
Requires: python-gpod
%endif
+%ifarch x86_64 ia64 ppc64 s390x
+%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
+%else
+%define gre_conf %{_sysconfdir}/gre.d/gre.conf
+%endif
+
%description
Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
It incorporates many of the cool things from AmaroK (and other media players)
@@ -62,15 +66,13 @@ make #%{?_smp_mflags}
rm -rf %{buildroot}
make install PREFIX=%{_prefix} LIBDIR=%{_libdir} \
- FIREFOX=%{firefox_lib} DESTDIR=%{buildroot}
+ GRE_CONF_PATH=%{gre_conf} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-chmod 755 %{buildroot}%{_bindir}/exaile
-
chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so
%find_lang %{name}
@@ -89,6 +91,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Wed Apr 02 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.13-1
+- Update to 0.2.13
+
* Sun Feb 10 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-2
- Rebuild for gcc43
diff --git a/sources b/sources
index d9645de..63aae7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22faad66c2baed6b0180925ea1323961 exaile_0.2.11.1.tar.gz
+3caf9381691274a9de1fda203c43fb4f exaile_0.2.13.tar.gz
commit ead8849c20cde56736d977a63a1fb9c9141838ff
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Mon Feb 11 04:28:52 2008 +0000
- Rebuild for gcc43
diff --git a/exaile.spec b/exaile.spec
index 3e751b4..fbb26e8 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,7 +3,7 @@
Summary: A music player
Name: exaile
Version: 0.2.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPL+ and Artistic
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Sun Feb 10 2008 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-2
+- Rebuild for gcc43
+
* Thu Nov 29 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-1
- Update to 0.2.11.1 that removes bogus cruft from 0.2.11 source tarball
- Rebuild for firefox-2.0.0.10
commit 4b8fafcd1e0aec5e551858c9805c4aaef364042d
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Thu Nov 29 16:00:53 2007 +0000
*** empty log message ***
diff --git a/exaile.spec b/exaile.spec
index 6148ba4..3e751b4 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -49,7 +49,7 @@ downloading of guitar tablature from
fretplay.com, and submitting played
tracks
on your iPod to last.fm
%prep
-%setup -q
+%setup -q -n exaile_%{version}
%patch0 -p0 -b .fix
# remove shebangs from all files as none should be executable scripts
commit 907a3a57889be44fbec2318e4fb84f3d74e14a1d
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Thu Nov 29 15:48:04 2007 +0000
- Update to 0.2.11.1 that removes bogus cruft from 0.2.11 source tarball
- Rebuild for firefox-2.0.0.10
diff --git a/.cvsignore b/.cvsignore
index 77be778..7b31755 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.11.tar.gz
+exaile_0.2.11.1.tar.gz
diff --git a/exaile.spec b/exaile.spec
index 65d1f4f..6148ba4 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -2,8 +2,8 @@
Summary: A music player
Name: exaile
-Version: 0.2.11
-Release: 2%{?dist}
+Version: 0.2.11.1
+Release: 1%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPL+ and Artistic
@@ -89,6 +89,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Thu Nov 29 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11.1-1
+- Update to 0.2.11.1 that removes bogus cruft from 0.2.11 source tarball
+- Rebuild for firefox-2.0.0.10
+
* Tue Nov 06 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-2
- Rebuild for firefox-2.0.0.9
diff --git a/sources b/sources
index 3b4a19a..d9645de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3dd3aa70f28f92aea496c5191cb5ce64 exaile_0.2.11.tar.gz
+22faad66c2baed6b0180925ea1323961 exaile_0.2.11.1.tar.gz
commit 6b4cd631eeb1f426e03c0d3bd21e52edb5e0d453
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Tue Nov 6 17:24:53 2007 +0000
- Rebuild for firefox-2.0.0.9
diff --git a/exaile.spec b/exaile.spec
index b48fb44..65d1f4f 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,7 +3,7 @@
Summary: A music player
Name: exaile
Version: 0.2.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPL+ and Artistic
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Tue Nov 06 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-2
+- Rebuild for firefox-2.0.0.9
+
* Mon Oct 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-1
- New release
commit 73f370a7a24f15a7d0b92ae418ec4d5961ea3819
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Tue Oct 23 04:29:02 2007 +0000
- New release
diff --git a/.cvsignore b/.cvsignore
index ba10c68..77be778 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.10.tar.gz
+exaile_0.2.11.tar.gz
diff --git a/exaile-launch_script.in b/exaile-launch_script.in
deleted file mode 100644
index 08ac835..0000000
--- a/exaile-launch_script.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
- FF_LIBDIR=`cat @GRE_CONF_PATH@ | grep GRE_PATH | sed -e 's/GRE_PATH=//'`
- cd @DATADIR@/exaile
- export LD_LIBRARY_PATH=$FF_LIBDIR
- exec python exaile.py "$@"
-
diff --git a/exaile-makefile.patch b/exaile-makefile.patch
new file mode 100644
index 0000000..175faa0
--- /dev/null
+++ b/exaile-makefile.patch
@@ -0,0 +1,83 @@
+--- Makefile 2007-10-02 12:25:55.000000000 -0400
++++ Makefile-new 2007-10-22 23:41:13.000000000 -0400
+@@ -18,14 +18,14 @@
+
+ make-install-dirs:
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/lib
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ mkdir -p $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
+ mkdir -p $(DESTDIR)$(PREFIX)/share/
+ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+@@ -41,26 +41,26 @@
+
+ install: make-install-dirs
+ install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1
+- install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ install -m 644 exaile.py $(DESTDIR)$(LIBDIR)/exaile
+ install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
+ install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
+ install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql
+- -install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ -install -m 644 mmkeys.so $(DESTDIR)$(LIBDIR)/exaile
+ install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images
+ install -m 644 images/default_theme/*.png \
+ $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme
+- install -m 644 xl/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- -install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl
+- install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- -install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media
+- install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels
+- install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui
+- install -m 644 lib/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
+- -install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib
++ install -m 644 xl/*.py $(DESTDIR)$(LIBDIR)/exaile/xl
++ -install -m 644 xl/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl
++ install -m 644 xl/media/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ -install -m 644 xl/media/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/media
++ install -m 644 xl/panels/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/panels
++ install -m 644 xl/gui/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/xl/gui
++ install -m 644 lib/*.py $(DESTDIR)$(LIBDIR)/exaile/lib
++ -install -m 644 lib/*.py[co] $(DESTDIR)$(LIBDIR)/exaile/lib
+ install -m 644 data/*.ini $(DESTDIR)$(PREFIX)/share/exaile/data
+- install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins
++ install -m 644 xl/plugins/*.py $(DESTDIR)$(LIBDIR)/exaile/xl/plugins
+ install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins
+ install -m 644 images/largeicon.png \
+ $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
+@@ -71,7 +71,7 @@
+ "cd $(PREFIX)/share/exaile\n" \
+ "export LD_LIBRARY_PATH=\$$LD_LIBRARY_PATH:$(FIREFOX)\n" \
+ "export MOZILLA_FIVE_HOME=$(FIREFOX)\n" \
+- "exec python $(PREFIX)$(LIBDIR)/exaile/exaile.py \"\$$@\"" \
++ "exec python $(LIBDIR)/exaile/exaile.py \"\$$@\"" \
+ > exaile && \
+ chmod 755 exaile
+ for f in `find po -name exaile.mo` ; do \
+@@ -91,7 +91,7 @@
+
+ uninstall:
+ rm -rf $(DESTDIR)$(PREFIX)/share/exaile
+- rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile
++ rm -rf $(DESTDIR)$(LIBDIR)/exaile
+ rm -rf $(DESTDIR)$(PREFIX)/bin/exaile
+ rm -f $(DESTDIR)$(PREFIX)/share/applications/exaile.desktop
+ rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
diff --git a/exaile.spec b/exaile.spec
index 3ef2d86..b48fb44 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,19 +1,22 @@
+%define firefox_lib %(pkg-config --variable=libdir firefox-gtkmozembed)
+
Summary: A music player
Name: exaile
-Version: 0.2.10
-Release: 3%{?dist}
+Version: 0.2.11
+Release: 1%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
-License: GPLv+ and Artistic
+License: GPL+ and Artistic
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
-Source1: exaile-launch_script.in
+Patch0: exaile-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
+BuildRequires: gecko-devel
BuildRequires: gettext intltool perl(XML::Parser)
Requires: python-mutagen >= 1.8
@@ -32,12 +35,6 @@ Requires: gamin-python
Requires: python-gpod
%endif
-%ifarch x86_64 ia64 ppc64 s390x
-%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
-%else
-%define gre_conf %{_sysconfdir}/gre.d/gre.conf
-%endif
-
%description
Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
It incorporates many of the cool things from AmaroK (and other media players)
@@ -52,12 +49,11 @@ downloading of guitar tablature from
fretplay.com, and submitting
played tracks
on your iPod to last.fm
%prep
-%setup -q -n %{name}_%{version}
+%setup -q
+%patch0 -p0 -b .fix
-#Fix typo in the desktop file
-sed -i 's/MimeType=M/M/' exaile.desktop
# remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i plugins/*.py exaile.py
+sed -e '/^#!\//,1 d' -i plugins/*.py xl/plugins/*.py xl/*.py exaile.py
%build
make #%{?_smp_mflags}
@@ -65,19 +61,14 @@ make #%{?_smp_mflags}
%install
rm -rf %{buildroot}
-make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBDIR=%{_libdir} \
+ FIREFOX=%{firefox_lib} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
- --remove-category=Application \
- --remove-category=AudioPlayer \
- --add-category=Audio \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-rm -rf %{buildroot}%{_bindir}/exaile
-sed
's#@DATADIR@#'%{_datadir}'#g;s#@GRE_CONF_PATH@#'%{gre_conf}'#g' \
- < %{SOURCE1} > %{buildroot}%{_bindir}/exaile
chmod 755 %{buildroot}%{_bindir}/exaile
chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so
@@ -98,6 +89,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Mon Oct 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.11-1
+- New release
+
* Tue Sep 11 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-3
- Require pygtk2-libglade (BZ #278471)
diff --git a/sources b/sources
index c8d32c0..3b4a19a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-776412d9844b06fe26444c0d7f74d712 exaile_0.2.10.tar.gz
+3dd3aa70f28f92aea496c5191cb5ce64 exaile_0.2.11.tar.gz
commit c932a26bee0a2f04658fe697dbe267308440fb8f
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Tue Sep 11 20:50:30 2007 +0000
- Require pygtk2-libglade (BZ #278471)
diff --git a/exaile.spec b/exaile.spec
index f960fb0..3ef2d86 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
License: GPLv+ and Artistic
@@ -20,7 +20,7 @@ Requires: python-mutagen >= 1.8
Requires: dbus-python
Requires: gstreamer-python >= 0.10
Requires: python-sqlite2
-Requires: pygtk2
+Requires: pygtk2-libglade
Requires: gnome-python2-gtkhtml2
Requires: gnome-python2-gtkmozembed
Requires: python-CDDB
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Tue Sep 11 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-3
+- Require pygtk2-libglade (BZ #278471)
+
* Wed Aug 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
- Rebuild
commit 6cc325ced56b13852b6b88cdc2adfcab006bc1e8
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Aug 22 11:56:33 2007 +0000
- Rebuild
diff --git a/exaile.spec b/exaile.spec
index 1f0b331..f960fb0 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -98,6 +98,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Wed Aug 22 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
+- Rebuild
+
* Fri Aug 03 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
- License tag update
commit ab740b24129a87e9d116e708d3939aa70b081c6f
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Aug 3 18:34:52 2007 +0000
Clarify the license tag correctly
diff --git a/exaile.spec b/exaile.spec
index 94cc6a5..1f0b331 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -3,7 +3,8 @@ Name: exaile
Version: 0.2.10
Release: 2%{?dist}
Group: Applications/Multimedia
-License: GPLv2+
+# It actually says GPL 1 or later version; a couple of files includes the Artistic
license
+License: GPLv+ and Artistic
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
Source1: exaile-launch_script.in
commit c9c5f338f9af92a5d112fb144a34e1753182b72b
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Aug 3 18:13:57 2007 +0000
- License tag update
diff --git a/exaile.spec b/exaile.spec
index bda0c43..94cc6a5 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,9 +1,9 @@
Summary: A music player
Name: exaile
Version: 0.2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
-License: GPL
+License: GPLv2+
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
Source1: exaile-launch_script.in
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/exaile*.*
%changelog
+* Fri Aug 03 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-2
+- License tag update
+
* Sat Jun 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-1
- New release
commit b19c2782ecea9e408deab2684e53c4cff40f0142
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Sat Jun 30 10:43:47 2007 +0000
- New release
diff --git a/.cvsignore b/.cvsignore
index a50b697..ba10c68 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.9.tar.gz
+exaile_0.2.10.tar.gz
diff --git a/exaile-launch_script.in b/exaile-launch_script.in
new file mode 100644
index 0000000..08ac835
--- /dev/null
+++ b/exaile-launch_script.in
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+ FF_LIBDIR=`cat @GRE_CONF_PATH@ | grep GRE_PATH | sed -e 's/GRE_PATH=//'`
+ cd @DATADIR@/exaile
+ export LD_LIBRARY_PATH=$FF_LIBDIR
+ exec python exaile.py "$@"
+
diff --git a/exaile-python.patch b/exaile-python.patch
deleted file mode 100644
index 9a8b0c4..0000000
--- a/exaile-python.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mmkeys/Makefile 2006-10-31 19:11:34.000000000 -0500
-+++ mmkeys/Makefile.new 2006-12-28 09:27:23.000000000 -0500
-@@ -1,6 +1,6 @@
- # Copyright 2004 Joe Wreschnig. Released under the terms of the GNU GPL.
-
--PYTHON_DIR = /usr/include/python2.4
-+PYTHON_DIR = `python -c 'from distutils import sysconfig; print
sysconfig.get_python_inc()'`
-
- CFLAGS += -fPIC -O2 `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I$(PYTHON_DIR)
- LDFLAGS += `pkg-config --libs gtk+-2.0 pygtk-2.0`
diff --git a/exaile.spec b/exaile.spec
index 83ace27..bda0c43 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,26 +1,27 @@
Summary: A music player
Name: exaile
-Version: 0.2.9
-Release: 4%{?dist}
+Version: 0.2.10
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
+Source1: exaile-launch_script.in
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: pygtk2-devel
BuildRequires: gtk2-devel
-BuildRequires: gstreamer-plugins-good-devel
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
+BuildRequires: gettext intltool perl(XML::Parser)
Requires: python-mutagen >= 1.8
Requires: dbus-python
Requires: gstreamer-python >= 0.10
Requires: python-sqlite2
-Requires: pygtk2
-Requires: gnome-python2-gtkhtml2
-Requires: gnome-python2-extras
+Requires: pygtk2
+Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
Requires: python-CDDB
Requires: python-sexy
Requires: gamin-python
@@ -30,6 +31,12 @@ Requires: gamin-python
Requires: python-gpod
%endif
+%ifarch x86_64 ia64 ppc64 s390x
+%define gre_conf %{_sysconfdir}/gre.d/gre64.conf
+%else
+%define gre_conf %{_sysconfdir}/gre.d/gre.conf
+%endif
+
%description
Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
It incorporates many of the cool things from AmaroK (and other media players)
@@ -46,18 +53,18 @@ on your iPod to last.fm
%prep
%setup -q -n %{name}_%{version}
+#Fix typo in the desktop file
+sed -i 's/MimeType=M/M/' exaile.desktop
# remove shebangs from all files as none should be executable scripts
-sed -e '/^#!\//,1 d' -i plugins/*.py
-sed -e '/^\s*strip /d' -i mmkeys/Makefile # fix -debuginfo
+sed -e '/^#!\//,1 d' -i plugins/*.py exaile.py
%build
-export CFLAGS="$RPM_OPT_FLAGS"
-make %{?_smp_mflags}
-
+make #%{?_smp_mflags}
+
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
desktop-file-install --delete-original \
--vendor="fedora" \
@@ -67,9 +74,12 @@ desktop-file-install --delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mv %{buildroot}%{_datadir}/%{name}/mmkeys.so %{buildroot}%{_libdir}/%{name}/
-chmod 755 %{buildroot}%{_libdir}/%{name}/mmkeys.so
+rm -rf %{buildroot}%{_bindir}/exaile
+sed
's#@DATADIR@#'%{_datadir}'#g;s#@GRE_CONF_PATH@#'%{gre_conf}'#g' \
+ < %{SOURCE1} > %{buildroot}%{_bindir}/exaile
+chmod 755 %{buildroot}%{_bindir}/exaile
+
+chmod 755 %{buildroot}%{_libdir}/exaile/mmkeys.so
%find_lang %{name}
@@ -84,22 +94,14 @@ rm -rf %{buildroot}
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/exaile.png
%{_datadir}/exaile/
+%{_mandir}/man1/exaile*.*
%changelog
-* Sat Mar 31 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-4
-- Yet more runtime dependencies
-
-* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-3
-- Fix typo
-
-* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-2
-- Add more runtime 'requires' (Debarshi Ray, BZ #231794)
-
-* Wed Mar 27 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
-- New version 0.2.9
+* Sat Jun 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.10-1
+- New release
-* Sun Jan 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-2
-- Fixes for empty debuginfo by Ville Skyttä (Bug #225093)
+* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
+- New release
* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
- New release
diff --git a/sources b/sources
index 5c87d2d..c8d32c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d52241d30a66286d9483e30e1259d8d4 exaile_0.2.9.tar.gz
+776412d9844b06fe26444c0d7f74d712 exaile_0.2.10.tar.gz
commit afe21e1927ecbe848d9792529d77215de9fa42f4
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Sat Mar 31 14:19:37 2007 +0000
- Yet more runtime dependencies
diff --git a/exaile.spec b/exaile.spec
index f3cf66b..83ace27 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.9
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
@@ -21,6 +21,9 @@ Requires: python-sqlite2
Requires: pygtk2
Requires: gnome-python2-gtkhtml2
Requires: gnome-python2-extras
+Requires: python-CDDB
+Requires: python-sexy
+Requires: gamin-python
%if "%fedora" > "6"
# for iPod device support
@@ -83,6 +86,9 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Sat Mar 31 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-4
+- Yet more runtime dependencies
+
* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-3
- Fix typo
commit d8b43bb4f366f93fcdd23e9b940411b2742c39c7
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Mar 30 10:54:20 2007 +0000
- Fix typo
diff --git a/exaile.spec b/exaile.spec
index e529b0e..f3cf66b 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
@@ -19,7 +19,7 @@ Requires: dbus-python
Requires: gstreamer-python >= 0.10
Requires: python-sqlite2
Requires: pygtk2
-Requires: gnome-python2-gtkhtml
+Requires: gnome-python2-gtkhtml2
Requires: gnome-python2-extras
%if "%fedora" > "6"
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-3
+- Fix typo
+
* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-2
- Add more runtime 'requires' (Debarshi Ray, BZ #231794)
commit fb41ec1d3bba5df205cad6f80526d8af02104ddb
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Mar 30 06:03:13 2007 +0000
- Add more runtime 'requires' (Debarshi Ray, BZ #231794)
diff --git a/exaile.spec b/exaile.spec
index be030f9..e529b0e 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
@@ -18,6 +18,9 @@ Requires: python-mutagen >= 1.8
Requires: dbus-python
Requires: gstreamer-python >= 0.10
Requires: python-sqlite2
+Requires: pygtk2
+Requires: gnome-python2-gtkhtml
+Requires: gnome-python2-extras
%if "%fedora" > "6"
# for iPod device support
@@ -80,6 +83,9 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Fri Mar 30 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-2
+- Add more runtime 'requires' (Debarshi Ray, BZ #231794)
+
* Wed Mar 27 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
- New version 0.2.9
commit 616f84a6997464ef3120f3328bc0fdd290a86580
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Wed Mar 28 21:07:34 2007 +0000
- New version 0.2.9
diff --git a/.cvsignore b/.cvsignore
index dc09b9b..a50b697 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.8.tar.gz
+exaile_0.2.9.tar.gz
diff --git a/exaile.spec b/exaile.spec
index 670d0a0..be030f9 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,12 +1,11 @@
Summary: A music player
Name: exaile
-Version: 0.2.8
-Release: 2%{?dist}
+Version: 0.2.9
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
-Patch0: exaile-python.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: pygtk2-devel
@@ -40,7 +39,6 @@ on your iPod to last.fm
%prep
%setup -q -n %{name}_%{version}
-%patch0 -p0 -b .python
# remove shebangs from all files as none should be executable scripts
sed -e '/^#!\//,1 d' -i plugins/*.py
@@ -67,10 +65,12 @@ mkdir -p %{buildroot}%{_libdir}/%{name}
mv %{buildroot}%{_datadir}/%{name}/mmkeys.so %{buildroot}%{_libdir}/%{name}/
chmod 755 %{buildroot}%{_libdir}/%{name}/mmkeys.so
+%find_lang %{name}
+
%clean
rm -rf %{buildroot}
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc changelog COPYING TODO
%{_bindir}/exaile
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Wed Mar 27 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.9-1
+- New version 0.2.9
+
* Sun Jan 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-2
- Fixes for empty debuginfo by Ville Skyttä (Bug #225093)
diff --git a/sources b/sources
index 35f82e1..5c87d2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a07d5acdebbc42a72e297963f5aec249 exaile_0.2.8.tar.gz
+d52241d30a66286d9483e30e1259d8d4 exaile_0.2.9.tar.gz
commit 2fddf5805688c76a222ba578be9637669330585e
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Feb 2 16:16:53 2007 +0000
Bump release
diff --git a/exaile.spec b/exaile.spec
index b1952a6..670d0a0 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
Version: 0.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
@@ -80,7 +80,7 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
-* Sun Jan 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
+* Sun Jan 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-2
- Fixes for empty debuginfo by Ville Skyttä (Bug #225093)
* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
commit a9d4b6f7aa23a27a58a01691360135268b29107e
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Sun Jan 28 22:51:51 2007 +0000
Fixes for empty -debuginfo
diff --git a/exaile.spec b/exaile.spec
index 19b9777..b1952a6 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -44,8 +44,11 @@ on your iPod to last.fm
# remove shebangs from all files as none should be executable scripts
sed -e '/^#!\//,1 d' -i plugins/*.py
+sed -e '/^\s*strip /d' -i mmkeys/Makefile # fix -debuginfo
%build
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -62,6 +65,7 @@ desktop-file-install --delete-original \
mkdir -p %{buildroot}%{_libdir}/%{name}
mv %{buildroot}%{_datadir}/%{name}/mmkeys.so %{buildroot}%{_libdir}/%{name}/
+chmod 755 %{buildroot}%{_libdir}/%{name}/mmkeys.so
%clean
rm -rf %{buildroot}
@@ -76,6 +80,9 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Sun Jan 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
+- Fixes for empty debuginfo by Ville Skyttä (Bug #225093)
+
* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
- New release
commit c0a4bb3ddbc8296ccabe4ed30acb0b1309f86f18
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Tue Jan 9 18:35:48 2007 +0000
auto-import exaile-0.2.8-1 on branch devel from exaile-0.2.8-1.src.rpm New
release
diff --git a/.cvsignore b/.cvsignore
index 6841ba5..dc09b9b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-exaile_0.2.6.tar.gz
+exaile_0.2.8.tar.gz
diff --git a/exaile.spec b/exaile.spec
index b2ed1a9..19b9777 100644
--- a/exaile.spec
+++ b/exaile.spec
@@ -1,7 +1,7 @@
Summary: A music player
Name: exaile
-Version: 0.2.6
-Release: 3%{?dist}
+Version: 0.2.8
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
URL:
http://www.exaile.org
@@ -42,6 +42,9 @@ on your iPod to last.fm
%setup -q -n %{name}_%{version}
%patch0 -p0 -b .python
+# remove shebangs from all files as none should be executable scripts
+sed -e '/^#!\//,1 d' -i plugins/*.py
+
%build
%install
@@ -65,7 +68,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc changelog TODO
+%doc changelog COPYING TODO
%{_bindir}/exaile
%{_libdir}/exaile/
%{_datadir}/applications/*.desktop
@@ -73,6 +76,12 @@ rm -rf %{buildroot}
%{_datadir}/exaile/
%changelog
+* Tue Jan 09 2007 Deji Akingunola <dakingun(a)gmail.com> - 0.2.8-1
+- New release
+
+* Sat Dec 30 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.7-1
+- New release
+
* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-3
- Rework the python include patch
diff --git a/sources b/sources
index 359bcf1..35f82e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05f8ad394f872f24c201d51687c96890 exaile_0.2.6.tar.gz
+a07d5acdebbc42a72e297963f5aec249 exaile_0.2.8.tar.gz
commit 559f82f5df4496dedeb2ab7dc400dd7d35b48e1a
Author: Deji Akingunola <deji(a)fedoraproject.org>
Date: Fri Dec 29 05:54:14 2006 +0000
auto-import exaile-0.2.6-3 on branch devel from exaile-0.2.6-3.src.rpm
diff --git a/.cvsignore b/.cvsignore
index e69de29..6841ba5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+exaile_0.2.6.tar.gz
diff --git a/exaile-python.patch b/exaile-python.patch
new file mode 100644
index 0000000..9a8b0c4
--- /dev/null
+++ b/exaile-python.patch
@@ -0,0 +1,10 @@
+--- mmkeys/Makefile 2006-10-31 19:11:34.000000000 -0500
++++ mmkeys/Makefile.new 2006-12-28 09:27:23.000000000 -0500
+@@ -1,6 +1,6 @@
+ # Copyright 2004 Joe Wreschnig. Released under the terms of the GNU GPL.
+
+-PYTHON_DIR = /usr/include/python2.4
++PYTHON_DIR = `python -c 'from distutils import sysconfig; print
sysconfig.get_python_inc()'`
+
+ CFLAGS += -fPIC -O2 `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I$(PYTHON_DIR)
+ LDFLAGS += `pkg-config --libs gtk+-2.0 pygtk-2.0`
diff --git a/exaile.spec b/exaile.spec
new file mode 100644
index 0000000..b2ed1a9
--- /dev/null
+++ b/exaile.spec
@@ -0,0 +1,83 @@
+Summary: A music player
+Name: exaile
+Version: 0.2.6
+Release: 3%{?dist}
+Group: Applications/Multimedia
+License: GPL
+URL:
http://www.exaile.org
+Source0:
http://www.exaile.org/files/exaile_%{version}.tar.gz
+Patch0: exaile-python.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python-devel
+BuildRequires: pygtk2-devel
+BuildRequires: gtk2-devel
+BuildRequires: gstreamer-plugins-good-devel
+BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig
+
+Requires: python-mutagen >= 1.8
+Requires: dbus-python
+Requires: gstreamer-python >= 0.10
+Requires: python-sqlite2
+
+%if "%fedora" > "6"
+# for iPod device support
+Requires: python-gpod
+%endif
+
+%description
+Exaile is a media player aiming to be similar to KDE's AmaroK, but for GTK+.
+It incorporates many of the cool things from AmaroK (and other media players)
+like automatic fetching of album art, handling of large libraries, lyrics
+fetching, artist/album information via the wikipedia, last.fm support, optional
+iPod support (assuming you have python-gpod installed).
+
+In addition, Exaile also includes a built in shoutcast directory browser,
+tabbed playlists (so you can have more than one playlist open at a time),
+blacklisting of tracks (so they don't get scanned into your library),
+downloading of guitar tablature from
fretplay.com, and submitting played tracks
+on your iPod to last.fm
+
+%prep
+%setup -q -n %{name}_%{version}
+%patch0 -p0 -b .python
+
+%build
+
+%install
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot}
+
+desktop-file-install --delete-original \
+ --vendor="fedora" \
+ --remove-category=Application \
+ --remove-category=AudioPlayer \
+ --add-category=Audio \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/mmkeys.so %{buildroot}%{_libdir}/%{name}/
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc changelog TODO
+%{_bindir}/exaile
+%{_libdir}/exaile/
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/exaile.png
+%{_datadir}/exaile/
+
+%changelog
+* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-3
+- Rework the python include patch
+
+* Wed Dec 27 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-2
+- Rewrite the build patch to be more generic
+
+* Tue Dec 26 2006 Deji Akingunola <dakingun(a)gmail.com> - 0.2.6-1
+- First version for Fedora Extras
diff --git a/sources b/sources
index e69de29..359bcf1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+05f8ad394f872f24c201d51687c96890 exaile_0.2.6.tar.gz