rpms/bmp/devel bmp-0.9.7.1-xmms-skins.patch, NONE, 1.1 bmp.spec, 1.7, 1.8 bmp-0.9.7-xmms-skins.patch, 1.2, NONE

[Ralf Ertzinger (ertzing)]

Author: ertzing

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

Modified Files:
	bmp.spec 
Added Files:
	bmp-0.9.7.1-xmms-skins.patch 
Removed Files:
	bmp-0.9.7-xmms-skins.patch 
Log Message:
- Upstream upgrade to 0.9.7.1
- Fix xmms-skin.patch for new version


bmp-0.9.7.1-xmms-skins.patch:

--- NEW FILE bmp-0.9.7.1-xmms-skins.patch ---
diff -uNr bmp-0.9.7.1-orig/beep/skinwin.c bmp-0.9.7.1/beep/skinwin.c
--- bmp-0.9.7.1-orig/beep/skinwin.c	2005-11-27 17:35:25.000000000 +0100
+++ bmp-0.9.7.1/beep/skinwin.c	2005-11-27 17:36:58.000000000 +0100
@@ -232,11 +232,15 @@
 skinlist_update(void)
 {
     gchar *skinsdir;
+    gchar xmmsskinsdir[] = "/usr/share/xmms/Skins";
 
     skinlist_clear();
 
     scan_skindir(bmp_paths[BMP_PATH_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.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bmp.spec	2 Jun 2005 18:09:46 -0000	1.7
+++ bmp.spec	27 Nov 2005 17:23:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           bmp
-Version:        0.9.7
-Release:        10%{?dist}
+Version:        0.9.7.1
+Release:        1%{?dist}
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -15,7 +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
+Patch3:         bmp-0.9.7.1-xmms-skins.patch
 Patch4:         bmp-0.9.7-shaded-skin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,7 +113,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
+%doc AUTHORS COPYING ChangeLog FAQ NEWS README
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/bmp
@@ -131,6 +131,10 @@
 
 
 %changelog
+* Sun Nov 27 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7.1-1%{dist}
+- Upstream upgrade to 0.9.7.1
+- Fix xmms-skin.patch for new version
+
 * Thu Jun 02 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-10%{?dist} 
 - bmp-0.9.7-shaded-skin.patch (BZ #158402)
 


--- bmp-0.9.7-xmms-skins.patch DELETED ---