rpms/gnash/devel gnash.desktop, NONE, 1.1 .cvsignore, 1.8, 1.9 gnash.spec, 1.41, 1.42 sources, 1.8, 1.9
Patrice Dumas
pertusus at fedoraproject.org
Mon Oct 20 14:07:04 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20571
Modified Files:
.cvsignore gnash.spec sources
Added Files:
gnash.desktop
Log Message:
* Sun Oct 19 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-3
- add a desktop file
--- NEW FILE gnash.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Gnash SWF Viewer
Name[fi]=Gnash-SWF-katselin
GenericName=SWF Viewer
Icon=GnashG
Exec=/usr/libexec/gnash-wrapper %U
Terminal=false
Categories=AudioVideo;GTK;Video;Player;
MimeType=application/x-shockwave-flash;application/futuresplash;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 18 Oct 2008 20:47:55 -0000 1.8
+++ .cvsignore 20 Oct 2008 14:06:34 -0000 1.9
@@ -1 +1,2 @@
gnash-0.8.4.tar.gz
+gnash-splash.swf
Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnash.spec 18 Oct 2008 23:03:32 -0000 1.41
+++ gnash.spec 20 Oct 2008 14:06:34 -0000 1.42
@@ -5,13 +5,16 @@
Name: gnash
Version: 0.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GNU flash movie player
Group: Applications/Multimedia
License: GPLv3+
URL: http://www.gnu.org/software/gnash/
Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.gz
+Source1: http://www.getgnash.org/gnash-splash.swf
+Source2: gnash.desktop
+
Patch0: gnash-0.8.3-manual.patch
# make autoreconf work
Patch1: gnash-0.8.4-configure.patch
@@ -42,6 +45,7 @@
BuildRequires: scrollkeeper
BuildRequires: giflib-devel
BuildRequires: gettext
+BuildRequires: desktop-file-utils
# Need to autoreconf for the KDE 4 patch
BuildRequires: autoconf automake libtool
@@ -184,9 +188,6 @@
# omf files are wrong
#rm -rf \
# $RPM_BUILD_ROOT%{_datadir}/omf
-# cygnal just segfaults
-#rm \
-# $RPM_BUILD_ROOT%{_bindir}/cygnal
# cp -p doc/C/actionscript.info $RPM_BUILD_ROOT%{_infodir}/
#mkdir -p $RPM_BUILD_ROOT%{_infodir}/
@@ -198,6 +199,31 @@
rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
#cp doc/C/gnash*.html __dist_docs/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnash/
+
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+# a wrapper to avoid gnash erroring out if there is no argument.
+# Instead open gnash-splash.swf.
+# this should not be needed in the next version.
+cat > $RPM_BUILD_ROOT%{_libexecdir}/gnash-wrapper << EOF
+#! /bin/sh
+if [ "z\$1" = 'z' ]; then
+ gnash %{_datadir}/gnash/gnash-splash.swf
+else
+ gnash "\$@"
+fi
+EOF
+
+chmod a+x $RPM_BUILD_ROOT%{_libexecdir}/gnash-wrapper
+
+sed -e 's;/usr/libexec;%{_libexecdir};' %{SOURCE2} > gnash.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor="fedora" \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
+ gnash.desktop
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32
+cp -p ./gui/images/GnashG.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32
#chmod a-x $RPM_BUILD_ROOT%{_datadir}/services/klash_part.desktop \
# $RPM_BUILD_ROOT%{_datadir}/apps/klash/pluginsinfo
@@ -221,6 +247,14 @@
/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
+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
#/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -234,6 +268,14 @@
/sbin/ldconfig
#scrollkeeper-update -q || :
+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
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS COPYING NEWS
@@ -260,6 +302,9 @@
%{_mandir}/man1/soldumper.1*
%{_infodir}/gnash*
%{_datadir}/gnash/
+%{_datadir}/icons/hicolor/32x32/*.png
+%{_datadir}/applications/*.desktop
+%{_libexecdir}/gnash-wrapper
#%{_datadir}/omf/gnash/
%files plugin
@@ -283,6 +328,9 @@
%{_mandir}/man1/cygnal.1*
%changelog
+* Sun Oct 19 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-3
+- add a desktop file
+
* Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.4-2
- update KDE 4 patch (undo the backporting and use original patch)
- patch to make autoreconf work
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 18 Oct 2008 20:47:55 -0000 1.8
+++ sources 20 Oct 2008 14:06:34 -0000 1.9
@@ -1 +1,2 @@
3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz
+3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf
More information about the fedora-extras-commits
mailing list