[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-338-g3f765d6

[Hicham HAOUARI]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  3f765d6e2e6ccdd01e06ed0b8042b1b299b4d130 (commit)
      from  0647384112935701cd5a273ed9a9c2be6c9c10a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=3f765d6e2e6ccdd01e06ed0b8042b1b299b4d130


commit 3f765d6e2e6ccdd01e06ed0b8042b1b299b4d130
Author: Hicham HAOUARI <address@hidden>
Date:   Fri Mar 25 01:26:44 2011 +0000

    Various rpm packaging fixes

diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 0095f34..d88f378 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -280,11 +280,15 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT
 
 %post 
-/sbin/ldconfig
 %if !%{cross_compile}
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU SWF Player" 
%{_infodir}/%{name}.info %{_infodir}/dir || :
 %endif
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -292,15 +296,32 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-/sbin/ldconfig
 %if !%{cross_compile}
 scrollkeeper-update -q || :
 %endif
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%post klash4
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+
+%postun klash4
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/gtk-gnash
+%{_bindir}/gnash-gtk-launcher
 %{_mandir}/man1/gtk-gnash.1.gz
+%{_mandir}/man1/gnash-gtk-launcher.1.gz
+%{_datadir}/icons/hicolor/32x32/apps/gnash.xpm
+%{_datadir}/applications/gnash.desktop
 
 %files common
 %defattr(-,root,root,-)
@@ -366,7 +387,10 @@ scrollkeeper-update -q || :
 %files klash4
 %defattr(-,root,root,-)
 %{_bindir}/qt4-gnash
+%{_bindir}/gnash-qt-launcher
 %{_mandir}/man1/qt4-gnash.1.gz
+%{_mandir}/man1/gnash-qt-launcher.1.gz
+%{_datadir}/applications/klash.desktop
 %{_prefix}/%{_lib}/kde4/libklashpart.*
 %{_prefix}/share/kde4/apps/klash/klashpartui.rc
 %{_prefix}/share/kde4/apps/klash/pluginsinfo

-----------------------------------------------------------------------

Summary of changes:
 packaging/redhat/gnash.spec |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash