rpms/listen/FC-5 listen.spec,1.15,1.16

[Haïkel Guémar (hguemar)]

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7000/FC-5

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue, some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:11 -0000	1.15
+++ listen.spec	14 Nov 2006 12:26:15 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?dist}
 Summary:        A music manager and player for GNOME
-
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://listengnome.free.fr
 Source0:        %name-%{version}b1.tar.gz
+Patch0:         Makefile.patch
+Patch1:         check.py.patch
+Patch2:         const.py.patch
+Patch3:         dialog.py.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}b1-%{release}-root-%(%{__id_u} -n)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-8.beta1
+* Mon Nov 13 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-7.beta1
+* Sat Oct 14 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-6.beta1
+* Thu Oct 12 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-5.beta1
+* Mon Oct 09 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-4.beta1
+* Mon Oct 09 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-3.beta1
+* Sun Oct 08 2006 Haïkel Guémar <karlthered at gmail.com> 0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Haïkel Guémar <karlthered at gmail.com> 0.5b1-2
+* Thu Oct 05 2006 Haïkel Guémar <karlthered at gmail.com> 0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Haïkel Guémar <karlthered at gmail.com> 0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Haïkel Guémar <karlthered at gmail.com> 0.4.3-1
 - First packaging
+
+
+