[gnash/gnash-git] Rename gtk and qt launchers
Hicham HAOUARI
hicham at fedoraproject.org
Fri Feb 25 15:26:40 UTC 2011
commit 11f58e350a5f2dcf9684417f64ecb605e3d1697f
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Fri Feb 25 15:25:33 2011 +0000
Rename gtk and qt launchers
...ssion-making-gui-gnash.in-not-preprocesse.patch | 37 ----
...Rename-gtk-gnash-and-kde4-gnash-launchers.patch | 222 ++++++++++++++++++++
gnash.spec | 5 +-
3 files changed, 225 insertions(+), 39 deletions(-)
---
diff --git a/0001-Rename-gtk-gnash-and-kde4-gnash-launchers.patch b/0001-Rename-gtk-gnash-and-kde4-gnash-launchers.patch
new file mode 100644
index 0000000..7e952d9
--- /dev/null
+++ b/0001-Rename-gtk-gnash-and-kde4-gnash-launchers.patch
@@ -0,0 +1,222 @@
+From e900e760ca8714f52ce735ee438f572400031a35 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Fri, 25 Feb 2011 15:20:02 +0000
+Subject: [PATCH] Rename gtk-gnash and kde4-gnash launchers
+
+---
+ configure.ac | 3 ++-
+ desktop/Makefile.am | 8 +++++++-
+ desktop/gnash-gtk-launcher.in | 27 +++++++++++++++++++++++++++
+ desktop/gnash-qt-launcher.in | 27 +++++++++++++++++++++++++++
+ desktop/gnash.desktop | 2 +-
+ desktop/klash.desktop | 2 +-
+ gui/Makefile.am | 4 ----
+ gui/gnash.in | 6 +-----
+ gui/klash.in | 27 ---------------------------
+ 9 files changed, 66 insertions(+), 40 deletions(-)
+ create mode 100644 desktop/gnash-gtk-launcher.in
+ create mode 100644 desktop/gnash-qt-launcher.in
+ delete mode 100644 gui/klash.in
+
+diff --git a/configure.ac b/configure.ac
+index 14b4f41..13e4f61 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2954,7 +2954,8 @@ AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashr
+
+ AC_CONFIG_FILES(
+ gnash.pc:gnash.pc.in
+-gui/klash:gui/klash.in
++desktop/gnash-gtk-launcher:desktop/gnash-gtk-launcher.in
++desktop/gnash-qt-launcher:desktop/gnash-qt-launcher.in
+ )
+
+ AC_OUTPUT(Makefile
+diff --git a/desktop/Makefile.am b/desktop/Makefile.am
+index afbebd9..37a5b4c 100644
+--- a/desktop/Makefile.am
++++ b/desktop/Makefile.am
+@@ -7,16 +7,22 @@ icons32_DATA =
+ splashdir = $(pkgdatadir)
+ splash_DATA = gnash-splash.swf
+
+-EXTRA_DIST = $(splash_DATA) $(desktop_DATA) $(icons32_DATA)
++EXTRA_DIST = gnash-splash.swf \
++ gnash.desktop \
++ klash.desktop \
++ gnash-gtk-launcher.in \
++ gnash-qt-launcher.in
+
+ if BUILD_GTK_GUI
+ desktop_DATA += gnash.desktop
+ icons32_DATA += ../packaging/gnash.xpm
++bin_SCRIPTS += gnash-gtk-launcher
+ endif
+
+ if BUILD_KDE4_GUI
+ desktop_DATA += klash.desktop
+ icons32_DATA += ../packaging/klash.xpm
++bin_SCRIPTS += gnash-qt-launcher
+ endif
+
+ validate-gnash-desktop: gnash.desktop
+diff --git a/desktop/gnash-gtk-launcher.in b/desktop/gnash-gtk-launcher.in
+new file mode 100644
+index 0000000..bf7bad9
+--- /dev/null
++++ b/desktop/gnash-gtk-launcher.in
+@@ -0,0 +1,27 @@
++#!/bin/sh
++
++#
++# gnash.splashed.launcher.gtk : Wrapper script for running the GTK version of gnash
++#
++# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++#
++
++if test "x$1" = "x" -a -f @prefix@/share/gnash/gnash-splash.swf; then
++ gtk-gnash @prefix@/share/gnash-splash.swf
++else
++ gtk-gnash "$@"
++fi
+diff --git a/desktop/gnash-qt-launcher.in b/desktop/gnash-qt-launcher.in
+new file mode 100644
+index 0000000..199598d
+--- /dev/null
++++ b/desktop/gnash-qt-launcher.in
+@@ -0,0 +1,27 @@
++#!/bin/sh
++
++#
++# klash: Wrapper script for running the KDE version of gnash
++#
++# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++#
++
++if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf; then
++ kde4-gnash @datadir@/gnash-splash.swf
++else
++ kde4-gnash "$@"
++fi
+diff --git a/desktop/gnash.desktop b/desktop/gnash.desktop
+index 98c4c5a..4e68ef5 100644
+--- a/desktop/gnash.desktop
++++ b/desktop/gnash.desktop
+@@ -4,7 +4,7 @@ Name=Gnash SWF Viewer
+ GenericName=SWF Viewer
+ Comment=View SWF Files
+ Icon=gnash
+-Exec=gnash %U
++Exec=gnash-gtk-launcher %U
+ Terminal=false
+ Categories=AudioVideo;Video;Player;GTK;
+ MimeType=application/x-shockwave-flash;application/futuresplash;
+diff --git a/desktop/klash.desktop b/desktop/klash.desktop
+index 6efab62..357c990 100644
+--- a/desktop/klash.desktop
++++ b/desktop/klash.desktop
+@@ -4,7 +4,7 @@ Name=Gnash SWF Viewer for KDE
+ GenericName=SWF Viewer
+ Comment=View SWF Files
+ Icon=klash
+-Exec=klash %U
++Exec=gnash-qt-launcher %U
+ Terminal=false
+ Categories=AudioVideo;Qt;KDE;
+ MimeType=application/x-shockwave-flash;application/futuresplash;
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 46cd7ca..4e997b7 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -191,10 +191,6 @@ gnash: gnash.in
+ cp $(srcdir)/gnash.in $@
+ chmod +x $@
+
+-if BUILD_KDE4_GUI
+-bin_SCRIPTS += klash
+-endif
+-
+ # Always include the device files in the source tarball
+ EXTRA_DIST += \
+ fb/TouchDevice.cpp \
+diff --git a/gui/gnash.in b/gui/gnash.in
+index 595710c..ca0f16d 100755
+--- a/gui/gnash.in
++++ b/gui/gnash.in
+@@ -57,11 +57,7 @@ fi
+ for gui in ${gui} ${GUIS}; do
+ exe=${THIS_DIR}/${gui}-gnash
+ if test -e ${exe}; then
+- if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf -a "${gui}" = "gtk";then
+- exec ${exe} @datadir@/gnash/gnash-splash.swf
+- else
+- exec ${exe} "$@"
+- fi
++ exec ${exe} "$@"
+ fi
+ done
+
+diff --git a/gui/klash.in b/gui/klash.in
+deleted file mode 100644
+index 199598d..0000000
+--- a/gui/klash.in
++++ /dev/null
+@@ -1,27 +0,0 @@
+-#!/bin/sh
+-
+-#
+-# klash: Wrapper script for running the KDE version of gnash
+-#
+-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 3 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-#
+-
+-if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf; then
+- kde4-gnash @datadir@/gnash-splash.swf
+-else
+- kde4-gnash "$@"
+-fi
+--
+1.7.4
+
diff --git a/gnash.spec b/gnash.spec
index 465e329..af2b1d9 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -103,7 +103,7 @@ autoreconf -if
%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
--enable-docbook --disable-ghelp --enable-media=GST \
--disable-dependency-tracking --disable-rpath \
- --disable-testsuite \
+ --enable-testsuite \
--without-swfdec-testsuite \
--without-ming \
--enable-cygnal \
@@ -178,6 +178,7 @@ touch --no-create %{_datadir}/icons/hicolor
%{_bindir}/fb-gnash
%{_bindir}/flvdumper
%{_bindir}/gtk-gnash
+%{_bindir}/gnash-gtk-launcher
%{_bindir}/rtmpget
%{_bindir}/sdl-gnash
%{_bindir}/soldumper
@@ -209,7 +210,7 @@ touch --no-create %{_datadir}/icons/hicolor
%defattr(-,root,root,-)
%doc COPYING
%{_datadir}/applications/klash.desktop
-%{_bindir}/klash
+%{_bindir}/gnash-qt-launcher
%{_kde4_bindir}/kde4-gnash
%{_kde4_libdir}/kde4/libklashpart.so
%{_kde4_appsdir}/klash/
More information about the scm-commits
mailing list