rpms/bmp/devel bmp.spec,1.13,1.14

[Ralf Ertzinger (ertzing)]

Author: ertzing

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

Modified Files:
	bmp.spec 
Log Message:
spec file cleanup


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bmp.spec	21 Feb 2006 15:02:11 -0000	1.13
+++ bmp.spec	16 Jul 2006 15:48:38 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           bmp
 Version:        0.9.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GTK2 based port of the XMMS media player
 
 Group:          Applications/Multimedia
@@ -21,14 +21,18 @@
 
 BuildRequires:  pkgconfig gtk2-devel esound-devel libvorbis-devel
 BuildRequires:  zlib-devel desktop-file-utils alsa-lib-devel
-BuildRequires:  gnome-vfs2-devel libglade2-devel
+BuildRequires:  gnome-vfs2-devel libglade2-devel GConf2-devel
 # This is probably temporary until the above libs get their dependencies
 # right
 BuildRequires:  libSM-devel libICE-devel libX11-devel libXrandr-devel
 BuildRequires:  libXau-devel libXi-devel libXft-devel libXinerama-devel
 BuildRequires:  libXcursor-devel libXrender-devel libXext-devel libXfixes-devel
 BuildRequires:  libXdmcp-devel libXt-devel
-PreReq: desktop-file-utils >= 0.9
+BuildRequires:  desktop-file-utils >= 0.9
+BuildRequires:  gettext
+
+Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
+Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
 
 %description
 BMP (Beep Media Player) is a media player that currently uses a skinned
@@ -67,7 +71,8 @@
 %endif
 	--disable-mp3 \
 	--enable-gconf \
-	--enable-gnome-vfs
+	--enable-gnome-vfs \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -87,8 +92,8 @@
     --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
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/bmp.desktop
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -98,9 +103,10 @@
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 # Replace icon
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/bmp.svg
-install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/bmp.png
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/bmp.png
+install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/bmp.png
 
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,11 +114,19 @@
 %post
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
@@ -124,7 +138,7 @@
 %{_datadir}/bmp
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
 %config(noreplace) %{_sysconfdir}/profile.d/bmp.sh
 
 %files devel
@@ -135,6 +149,9 @@
 
 
 %changelog
+* Sat Jul 15 2006 Ralf Ertzinger <ralf at skytale.net> 0.9.7.1-5.fc6
+- spec file cleanup
+
 * Tue Feb 21 2006 Ralf Ertzinger <ralf at skytale.net> 0.9.7.1-4.fc5
 - Bumped and rebuilt for FC5