rpms/exaile/devel .cvsignore, 1.9, 1.10 exaile-makefile.patch, 1.2, 1.3 exaile.spec, 1.26, 1.27 sources, 1.9, 1.10

Sat Aug 29 22:46:32 UTC 2009

Author: deji

Update of /cvs/pkgs/rpms/exaile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26070

Modified Files:
	.cvsignore exaile-makefile.patch exaile.spec sources 
Log Message:
* Fri Aug 28 2009 Deji Akingunola <dakingun at gmail.com> - 0.3.0-1
- Update to 0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10

--- .cvsignore	9 Oct 2008 05:21:16 -0000	1.9
+++ .cvsignore	29 Aug 2009 22:46:31 -0000	1.10
@@ -1 +1 @@
-exaile_0.2.14.tar.gz
+exaile-0.3.0.tar.gz

exaile-makefile.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: exaile-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- exaile-makefile.patch	2 Apr 2008 13:43:10 -0000	1.2
+++ exaile-makefile.patch	29 Aug 2009 22:46:31 -0000	1.3
@@ -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


Index: exaile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/exaile.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- exaile.spec	24 Jul 2009 22:24:42 -0000	1.26
+++ exaile.spec	29 Aug 2009 22:46:31 -0000	1.27
@@ -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}.tar.gz
 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 at gmail.com> - 0.3.0-1
+- Update to 0.3.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exaile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	9 Oct 2008 05:21:16 -0000	1.9
+++ sources	29 Aug 2009 22:46:31 -0000	1.10
@@ -1 +1 @@
-5e569c084134abe13d651f804812b6fa  exaile_0.2.14.tar.gz
+8d89110396b088042f39677892829e2d  exaile-0.3.0.tar.gz


