devel/bmp bmp-0.9.7-xmms-skins.patch, NONE, 1.1 bmp.sh, 1.1, 1.2 bmp.spec, 1.2, 1.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/bmp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32174

Modified Files:
	bmp.sh bmp.spec 
Added Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh



bmp-0.9.7-xmms-skins.patch:

--- NEW FILE bmp-0.9.7-xmms-skins.patch ---
diff -Nur bmp-0.9.7-orig/beep/skinwin.c bmp-0.9.7/beep/skinwin.c
--- bmp-0.9.7-orig/beep/skinwin.c	2004-12-04 10:04:29.000000000 +0100
+++ bmp-0.9.7/beep/skinwin.c	2005-03-18 14:40:23.000000000 +0100
@@ -230,11 +230,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_user_skin_dir);
     scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+    if (g_file_test(xmmsskinsdir, G_FILE_TEST_IS_DIR)) {
+        scan_skindir( xmmsskinsdir);
+    }
 
     skinsdir = getenv("SKINSDIR");
     if (skinsdir) {


Index: bmp.sh
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bmp.sh	16 Mar 2005 17:24:48 -0000	1.1
+++ bmp.sh	18 Mar 2005 14:17:22 -0000	1.2
@@ -2,4 +2,4 @@
 
 # Colon-separated directory path to look for
 # additional skins. See man beep-media-player.
-export SKINSDIR=/usr/share/xmms/Skins
+#export SKINSDIR=


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/devel/bmp/bmp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bmp.spec	17 Mar 2005 20:35:30 -0000	1.2
+++ bmp.spec	18 Mar 2005 14:17:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        5
+Release:        6
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch0:         bmp-0.9.7-readmacro.patch
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
+Patch3:         bmp-0.9.7-xmms-skins.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
@@ -49,6 +50,7 @@
 %patch1 -p1 -b .default-skin
 
 %patch2 -p1 -b .default-alsa
+%patch3 -p1 -b .xmms-skins
 
 
 %build
@@ -117,6 +119,9 @@
 
 
 %changelog
+* Fri Mar 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-6
+- Enable XMMS skins directory inside binary, not via profile.d/bmp.sh
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.9.7-5
 - Add -devel dependencies needed for headers and pkgconfig template.