rpms/listen/FC-5 Makefile.patch, NONE, 1.1 check.py.patch, NONE, 1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 listen.spec, 1.17, 1.18 sources, 1.4, 1.5

[Haïkel Guémar (hguemar)]

Author: hguemar

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

Modified Files:
	.cvsignore listen.spec sources 
Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne à la fin du fichier.
+        self.run()
+        self.destroy()
+        


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
+++ .cvsignore	14 Nov 2006 17:10:04 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:23:18 -0000	1.17
+++ listen.spec	14 Nov 2006 17:10:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:23:18 -0000	1.4
+++ sources	14 Nov 2006 17:10:04 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch