rpms/exaile/devel exaile-makefile.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 exaile.spec, 1.13, 1.14 sources, 1.5, 1.6 exaile-launch_script.in, 1.1, NONE
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Tue Oct 23 04:29:34 UTC 2007
Author: deji
Update of /cvs/extras/rpms/exaile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9056
Modified Files:
.cvsignore exaile.spec sources
Added Files:
exaile-makefile.patch
Removed Files:
exaile-launch_script.in
Log Message:
* Mon Oct 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.11-1
- New release
exaile-makefile.patch:
--- NEW FILE exaile-makefile.patch ---
--- 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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exaile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 30 Jun 2007 10:43:47 -0000 1.5
+++ .cvsignore 23 Oct 2007 04:29:02 -0000 1.6
@@ -1 +1 @@
-exaile_0.2.10.tar.gz
+exaile_0.2.11.tar.gz
Index: exaile.spec
===================================================================
RCS file: /cvs/extras/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- exaile.spec 11 Sep 2007 20:50:30 -0000 1.13
+++ exaile.spec 23 Oct 2007 04:29:02 -0000 1.14
@@ -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: 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 @@
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 @@
%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 @@
%{_mandir}/man1/exaile*.*
%changelog
+* Mon Oct 22 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.11-1
+- New release
+
* Tue Sep 11 2007 Deji Akingunola <dakingun at gmail.com> - 0.2.10-3
- Require pygtk2-libglade (BZ #278471)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exaile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 30 Jun 2007 10:43:47 -0000 1.5
+++ sources 23 Oct 2007 04:29:02 -0000 1.6
@@ -1 +1 @@
-776412d9844b06fe26444c0d7f74d712 exaile_0.2.10.tar.gz
+3dd3aa70f28f92aea496c5191cb5ce64 exaile_0.2.11.tar.gz
--- exaile-launch_script.in DELETED ---
More information about the fedora-extras-commits
mailing list