rpms/qbittorrent/devel qbittorrent.spec,1.17,1.18

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15424

Modified Files:
	qbittorrent.spec 
Log Message:
* Tue Jun 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.4.20090429svn
- replace update-mime-database with update-desktop-database
- update scriplets to the latest guidelines
- clean up white space



Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- qbittorrent.spec	4 Jun 2009 12:54:20 -0000	1.17
+++ qbittorrent.spec	23 Jun 2009 20:35:42 -0000	1.18
@@ -1,6 +1,5 @@
 %define svn_rev 2341
 
-
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 1.4.0
@@ -26,7 +25,6 @@ BuildRequires: zziplib-devel
 BuildRequires: rb_libtorrent-devel >= 0.14.1
 BuildRequires: curl-devel, glib2-devel
 
-
 %description
 A Bittorrent client using rb_libtorrent and a Qt4 Graphical User Interface.
 It aims to be as fast as possible and to provide multi-OS, unicode support.
@@ -35,7 +33,6 @@ It aims to be as fast as possible and to
 %setup -q -n %{name}
 %patch0 -p1 -b .qbittorrent_flag
 
-
 %build
 # use ./configure instead of %%configure as it doesn't work
 CFLAGS="%optflags" CXXFLAGS="%optflags" \
@@ -46,46 +43,42 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 
-
-desktop-file-install --vendor="" \
+desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applications/qBittorrent.desktop
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
-
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-, root, root, -)
 %doc README NEWS COPYING AUTHORS TODO Changelog
 %{_mandir}/man1/qbittorrent.1*
-%{_bindir}/%{name}
+%{_bindir}/qbittorrent
 %{_datadir}/applications/qBittorrent.desktop
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
-
-
 %changelog
+* Tue Jun 23 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.4.20090429svn
+- replace update-mime-database with update-desktop-database
+- update scriplets to the latest guidelines
+- clean up white space
+
 * Thu Jun 4 2009 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-0.3.20090429svn
 - Rebuild against the new rb_libtorrent version 0.14.4