[svn] r6523 - trunk/rpms/exaile

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sat Oct 18 12:32:51 CEST 2008


Author: hadams
Date: 2008-10-18 11:32:51 +0100 (Sat, 18 Oct 2008)
New Revision: 6523

Modified:
   trunk/rpms/exaile/exaile-makefile.patch
   trunk/rpms/exaile/exaile.spec
Log:
Update to 0.2.14

Modified: trunk/rpms/exaile/exaile-makefile.patch
===================================================================
--- trunk/rpms/exaile/exaile-makefile.patch	2008-10-18 09:26:51 UTC (rev 6522)
+++ trunk/rpms/exaile/exaile-makefile.patch	2008-10-18 10:32:51 UTC (rev 6523)
@@ -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

Modified: trunk/rpms/exaile/exaile.spec
===================================================================
--- trunk/rpms/exaile/exaile.spec	2008-10-18 09:26:51 UTC (rev 6522)
+++ trunk/rpms/exaile/exaile.spec	2008-10-18 10:32:51 UTC (rev 6523)
@@ -1,40 +1,38 @@
 # $Id$
-# Authority: hadams
+# Authority:    hadams
 
-Summary: Music player
-Name: exaile
-Version: 0.2.13
-Release: 2
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.exaile.org/
+%define real_version 0.2.14
 
-Source: http://www.exaile.org/files/exaile_%{version}.tar.gz
-Patch0: exaile0212-makefile.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires: desktop-file-utils
-BuildRequires: firefox-devel
-BuildRequires: gettext
-BuildRequires: gtk2-devel
-BuildRequires: intltool
-BuildRequires: perl(XML::Parser)
-BuildRequires: pkgconfig
-BuildRequires: pygtk2-devel
-BuildRequires: python-devel
+Summary:	A music player
+Name:		exaile
+Version:	0.2.14
+Release:	1
+Group:		Applications/Multimedia
+License:	GPL
+URL:		http://www.exaile.org
+Source0:	http://www.exaile.org/files/%{name}_%{real_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:	gettext intltool perl(XML::Parser)
+#BuildRequires:	firefox-devel
 BuildRequires: xulrunner-devel
 
-Requires: dbus-python
-Requires: gamin-python
-Requires: gnome-python2-gtkhtml2
-Requires: gnome-python2-gtkmozembed
-Requires: gstreamer-python >= 0.10
-Requires: pygtk2
-Requires: python-CDDB
-Requires: python-mutagen >= 1.8
-Requires: python-sexy
-Requires: python-sqlite2
-Requires: xulrunner
+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-gtkmozembed
+Requires:	python-CDDB
+Requires:	python-sexy
+Requires:	gamin-python
+Requires: 	xulrunner
 
 %ifarch x86_64 ia64 ppc64 s390x
 %define gre_conf %{_sysconfdir}/gre.d/gre64.conf
@@ -56,46 +54,49 @@
 on your iPod to last.fm
 
 %prep
-%setup -n %{name}_%{version}
+%setup -n %{name}-%{real_version}
 %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}
+rm -rf %{buildroot}
 
-%{__make} install DESTDIR="%{buildroot}" \
-    PREFIX="%{_prefix}" \
-    LIBDIR="%{_libdir}" \
-    FIREFOX="%{firefox_lib}"
-%find_lang %{name}
+make install PREFIX=%{_prefix} LIBDIR=%{_libdir}	\
+	FIREFOX=%{firefox_lib} DESTDIR=%{buildroot}
 
-desktop-file-install --delete-original          \
-    --vendor="fedora"               \
-    --dir=%{buildroot}%{_datadir}/applications  \
-    %{buildroot}%{_datadir}/applications/%{name}.desktop
+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}
+
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,0755)
 %doc changelog COPYING INSTALL
-%doc %{_mandir}/man1/exaile*.*
 %{_bindir}/exaile
+%{_libdir}/exaile
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/exaile.png
 %{_datadir}/exaile/
-%{_libdir}/exaile
+%{_mandir}/man1/exaile*.*
 
 %changelog
+* Sat Oct 18 2008 Heiko Adams <info at fedora-blog.de> - 0.2.14-1
+- version update
+
 * Sun Aug 24 2008 Heiko Adams <info at fedora-blog.de> - 0.2.13-2
 - rebuild for CentOS 5.2
 




More information about the commits mailing list