rpms/bmp/FC-4 bmp-0.9.7-shaded-skin.patch, NONE, 1.1 bmp.spec, 1.5, 1.6

[Ralf Ertzinger (ertzing)]

Author: ertzing

Update of /cvs/extras/rpms/bmp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3627

Modified Files:
	bmp.spec 
Added Files:
	bmp-0.9.7-shaded-skin.patch 
Log Message:
Merge changes from devel


bmp-0.9.7-shaded-skin.patch:

--- NEW FILE bmp-0.9.7-shaded-skin.patch ---
--- bmp-0.9.7/beep/skin.c.shaded-skin	2004-12-04 10:04:28.000000000 +0100
+++ bmp-0.9.7/beep/skin.c	2005-06-02 20:01:00.000000000 +0200
@@ -1130,7 +1130,7 @@
                          (i * 25) + 25, 0, 25, 14);
 
     /* right corner */
-    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 57 : 42,
+    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 42 : 57,
                      width - 50, 0, 50, 14);
 }
 


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/FC-4/bmp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bmp.spec	21 May 2005 17:46:54 -0000	1.5
+++ bmp.spec	8 Jun 2005 17:42:03 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -16,12 +16,14 @@
 Patch1:         bmp-0.9.7-default-skin.patch
 Patch2:         bmp-0.9.7-default-alsa.patch
 Patch3:         bmp-0.9.7-xmms-skins.patch
+Patch4:         bmp-0.9.7-shaded-skin.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
 BuildRequires:  zlib-devel desktop-file-utils alsa-lib-devel
 BuildRequires:  gnome-vfs2-devel libglade2-devel
 #BuildRequires:  id3lib-devel
+PreReq: desktop-file-utils >= 0.9
 
 %description
 BMP (Beep Media Player) is a media player that currently uses a skinned
@@ -49,6 +51,9 @@
 %patch2 -p1 -b .default-alsa
 %patch3 -p1 -b .xmms-skins
 
+# Fix wrong focussed/unfocussed skin for shaded playlist/equalizer
+%patch4 -p1 -b .shaded-skin
+
 
 %build
 %configure \
@@ -66,11 +71,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+# Image is png, not svg
 perl -pi -e 's/svg/png/ ; s/^(Categories=.+[^;\n])$/\1;/' beep/bmp.desktop
+
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
     --add-category X-Fedora  \
     --add-category Application  \
+    --remove-mime-type audio/mp3 \
+    --remove-mime-type audio/x-mp3 \
+    --remove-mime-type audio/mpeg \
+    --remove-mime-type audio/x-mpeg \
     beep/bmp.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bmp.desktop
 
@@ -90,10 +101,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications
 
 
 %files -f %{name}.lang
@@ -116,6 +131,13 @@
 
 
 %changelog
+* Thu Jun 02 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-10%{?dist} 
+- bmp-0.9.7-shaded-skin.patch (BZ #158402)
+
+* Thu Jun 02 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-9%{?dist}
+- Removed MPEG filetypes from desktop file
+- Call update-desktop-database in post/postun (BZ #159129)
+
 * Sat May 21 2005 Ralf Ertzinger <ralf at skytale.net> 0.9.7-8%{?dist} 
 - Added %%{dist}