rpms/gnash/F-9 gnash-0.8.4-configure.patch, NONE, 1.1 gnash-0.8.4-port-to-kde4.patch, NONE, 1.1 gnash.desktop, NONE, 1.1 .cvsignore, 1.7, 1.8 gnash.spec, 1.25, 1.26 sources, 1.7, 1.8 gnash-0.8.3-glib_link.patch, 1.1, NONE gnash-0.8.3-port-to-kde4.patch, 1.1, NONE
Patrice Dumas
pertusus at fedoraproject.org
Mon Oct 20 19:40:38 UTC 2008
- Previous message: rpms/ptlib/devel .cvsignore, 1.3, 1.4 ptlib.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/opal/devel .cvsignore, 1.13, 1.14 opal.spec, 1.28, 1.29 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/gnash/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7288
Modified Files:
.cvsignore gnash.spec sources
Added Files:
gnash-0.8.4-configure.patch gnash-0.8.4-port-to-kde4.patch
gnash.desktop
Removed Files:
gnash-0.8.3-glib_link.patch gnash-0.8.3-port-to-kde4.patch
Log Message:
sync with devel: update to 0.8.4
gnash-0.8.4-configure.patch:
--- NEW FILE gnash-0.8.4-configure.patch ---
diff -ur gnash-0.8.4/configure.ac gnash-0.8.4-configure/configure.ac
--- gnash-0.8.4/configure.ac 2008-10-13 15:01:34.000000000 +0200
+++ gnash-0.8.4-configure/configure.ac 2008-10-19 00:05:34.000000000 +0200
@@ -877,7 +877,7 @@
LT_INIT([dlopen win32-dll disable-static])
dnl lt_ltdl_dir=libbase/libltdlL
LTDL_INIT([convenience recursive])
-AC_CONFIG_FILES([libltdl/Makefile])
+dnl AC_CONFIG_FILES([libltdl/Makefile])
fi
AC_PROG_LIBTOOL
AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
gnash-0.8.4-port-to-kde4.patch:
--- NEW FILE gnash-0.8.4-port-to-kde4.patch ---
--- gnash/configure.ac.kde4~ 2008-10-07 13:30:16.000000000 +0200
+++ gnash/configure.ac 2008-10-08 16:22:25.912076411 +0200
@@ -478,10 +478,12 @@ esac], sdkinstall=no)
AM_CONDITIONAL(SDKINSTALL, test x$sdkinstall = xyes)
+has_kde4=no
has_kde=no
has_gtk2=no
build_fb=no
build_fltk=no
+build_kde4=no
build_kde=no
build_gtk=no
build_sdl=no
@@ -514,9 +516,12 @@ dnl AC_DEFINE(USE_ALP, [1], [Use
dnl AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
build_gtk=yes
;;
- kde|KDE)
+ kde|KDE|kde3|KDE3)
build_kde=yes
;;
+ kde4|KDE4)
+ build_kde4=yes
+ ;;
qtopia|QTOPIA)
build_qtopia=yes
build_qt=yes
@@ -547,6 +552,7 @@ dnl AC_DEFINE(USE_GTK, [1], [Use
build_fb=yes
build_fltk=yes
build_kde=yes
+ build_kde4=yes
build_gtk=yes
build_sdl=yes
dnl build_qtopia=yes
@@ -554,7 +560,7 @@ dnl build_hildon=yes
dnl build_alp=yes
dnl build_riscos=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: gtk|kde|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia|dump)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: gtk|kde|kde4|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia|dump)])
;;
esac]
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1236,9 +1242,21 @@ AC_ARG_ENABLE(kparts,
[case "${enableval}" in
yes) kparts=yes ;;
no) kparts=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --disable-kpart option]) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --disable-kparts option]) ;;
esac],kparts=$build_kde)
+dnl --------------------------------------------------------
+dnl Add KPARTS 4.x support, if specified or KDE gui is built
+dnl --------------------------------------------------------
+
+AC_ARG_ENABLE(kparts4,
+ AC_HELP_STRING([--disable-kparts4], [Disble support for Konqueror 4.x plugin (default: enabled if kde4 gui is)]),
+[case "${enableval}" in
+ yes) kparts4=yes ;;
+ no) kparts4=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --disable-kparts4 option]) ;;
+esac],kparts4=$build_kde4)
+
dnl ----------------------------------------------------
dnl Add NPAPI support, if specified or GTK gui is built
dnl ----------------------------------------------------
@@ -1269,6 +1287,7 @@ AC_ARG_ENABLE(plugins,
if test x$plugins = xno; then
npapi=no
kparts=no
+ kparts4=no
fi
dnl
@@ -1618,6 +1637,13 @@ dnl # Check KDE if kde gui or kparts wer
if test x$build_kde = xyes -o x$kparts = xyes; then
GNASH_PATH_KDE
fi
+if test x$build_kde4 = xyes -o x$kparts4 = xyes; then
+ GNASH_QT4_GUI
+ GNASH_PATH_KDE4
+ if test "x$gnash_cv_lib_kde_dir" != xno; then
+ has_kde4=yes
+ fi
+fi
if test x$build_qt = xyes -o x$build_qtopia = xyes -o x$build_kde = xyes; then
GNASH_PATH_QT
if test x$build_qtopia = xyes; then
@@ -1626,6 +1652,7 @@ if test x$build_qt = xyes -o x$build_qto
fi
AM_CONDITIONAL(HAVE_QTOPIA, [test x$has_qtopia = xyes])
AM_CONDITIONAL(HAVE_KDE, [test x$has_kde = xyes])
+AM_CONDITIONAL(HAVE_KDE4, [test x$has_kde4 = xyes])
AM_CONDITIONAL(HAVE_QT, [test x$has_qt = xyes])
AM_CONDITIONAL(HAVE_QTOPIA_2, [test x"$gnash_qtopia_version" = x2])
@@ -1667,6 +1694,15 @@ fi
if test x$build_kde = xno -a x$kparts = xyes; then
AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based GUI!"])
fi
+if test x$has_kde4 = xno -a x$kparts4 = xyes; then
+ kparts4=no
+dnl build_kde4=no
+ AC_MSG_WARN(["Disabling KPARTS 4.x plugin, no KDE 4.x development found"])
+fi
+
+if test x$build_kde4 = xno -a x$kparts4 = xyes; then
+ AC_MSG_WARN(["Enabled KPARTS 4.x plugin, but you aren't building a KDE 4.x based GUI!"])
+fi
AM_CONDITIONAL(BUILD_QTOPIA_GUI, [ test x$build_qtopia = xyes ])
AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
@@ -1674,6 +1710,7 @@ AM_CONDITIONAL(BUILD_QT_GUI, [ test x$bu
AM_CONDITIONAL(BUILD_HILDON_GUI, [ test x$build_hildon = xyes ])
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
+AM_CONDITIONAL(BUILD_KDE4_GUI, [ test x$build_kde4 = xyes ])
AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl = xyes ])
AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
@@ -1684,6 +1721,7 @@ AM_CONDITIONAL(BUILD_DUMP_GUI, [ test x$
# plugin building flags
AM_CONDITIONAL(NPAPI, [test x$npapi = xyes])
AM_CONDITIONAL(KPARTS, [test x$kparts = xyes])
+AM_CONDITIONAL(KPARTS4, [test x$kparts4 = xyes])
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
@@ -2088,6 +2126,9 @@ fi
if test x$build_kde = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},kde"
fi
+if test x$build_kde4 = xyes; then
+ SUPPORTED_GUIS="${SUPPORTED_GUIS},kde4"
+fi
if test x$build_gtk = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},gtk"
fi
@@ -2158,6 +2199,7 @@ extensions/metome/Makefile
plugin/Makefile
plugin/xpcom/Makefile
plugin/klash/Makefile
+plugin/klash4/Makefile
plugin/mozilla-sdk/Makefile
plugin/win32/Makefile
cygnal/Makefile
@@ -2212,13 +2254,23 @@ else
fi
if test x"$kparts" = x"yes"; then
- echo " KPARTS plugin enabled (default). Use --disable-kparts to disable"
- echo " KPARTS plugin will be installed in ${KDE_PLUGINDIR}"
- echo " KPARTS service will be installed in ${KDE_SERVICESDIR}"
- echo " KPARTS config dir will be in ${KDE_CONFIGDIR}"
- echo " KPARTS appsdata will be installed in ${KDE_APPSDATADIR}"
+ echo " KPARTS 3.x plugin enabled (default). Use --disable-kparts to disable"
+ echo " KPARTS 3.x plugin will be installed in ${KDE_PLUGINDIR}"
+ echo " KPARTS 3.x service will be installed in ${KDE_SERVICESDIR}"
+ echo " KPARTS 3.x config dir will be in ${KDE_CONFIGDIR}"
+ echo " KPARTS 3.x appsdata will be installed in ${KDE_APPSDATADIR}"
+else
+ echo " KPARTS 3.x plugin disabled."
+fi
+
+if test x"$kparts4" = x"yes"; then
+ echo " KPARTS 4.x plugin enabled (default). Use --disable-kparts4 to disable"
+ echo " KPARTS 4.x plugin will be installed in ${KDE4_PLUGINDIR}"
+ echo " KPARTS 4.x service will be installed in ${KDE4_SERVICESDIR}"
+ echo " KPARTS 4.x config dir will be in ${KDE4_CONFIGDIR}"
+ echo " KPARTS 4.x appsdata will be installed in ${KDE4_APPSDATADIR}"
else
- echo " KPARTS plugin disabled."
+ echo " KPARTS 4.x plugin disabled."
fi
dnl -- if test x"${dynamic_gui}" = x"yes"; then
@@ -2311,17 +2363,17 @@ fi
if test x$build_kde = xyes -o x$kparts = xyes; then
if test x"$has_kde" = xyes; then
- echo " KDE flags are: $KDE_CFLAGS"
- echo " KDE libs are: $KDE_LIBS"
+ echo " KDE 3.x flags are: $KDE_CFLAGS"
+ echo " KDE 3.x libs are: $KDE_LIBS"
else
- echo " ERROR: No KDE development package installed!" >&3
- echo " To disable the KDE gui," >&3
+ echo " ERROR: No KDE 3.x development package installed!" >&3
+ echo " To disable the KDE 3.x gui," >&3
echo " reconfigure using --enable-gui=<list-of-guis>" >&3
echo " and omit "kde" from the list." >&3
echo " When the option --enable-gui=... is omitted," >&3
echo " the default is the same of --enable-gui=kde,gtk" >&3
- echo " To be able to build the kde gui," >&3
- echo " install the KDE development environment from http://kde.org" >&3
+ echo " To be able to build the kde 3.x gui," >&3
[...2610 lines suppressed...]
+ <Action name="stop"/>
+ </Menu>
+</MenuBar>
+<Toolbar name="mainToolBar"><text></text>
+ <Action name="play"/>
+ <Action name="pause"/>
+ <Action name="stop"/>
+</Toolbar>
+</kpartgui>
--- gnash/plugin/klash4/klashplayer.lsm.kde4~ 2008-10-08 15:59:00.112076067 +0200
+++ gnash/plugin/klash4/klashplayer.lsm 2008-10-08 15:59:00.112076067 +0200
@@ -0,0 +1,14 @@
+Begin3
+Title: Klashplayer
+Version: 0.0.1-pre1
+Entered-date:
+Description:
+Keywords:
+Author: Koos Vriezen <>
+Maintained-by: Koos Vriezen <>
+Primary-site:
+Home-page: http://xx.kde.org
+Original-site:
+Platforms: Linux and other Unices
+Copying-policy: GNU Public License
+End
--- gnash/plugin/klash4/Makefile.am.kde4~ 2008-10-08 15:59:00.112076067 +0200
+++ gnash/plugin/klash4/Makefile.am 2008-10-08 15:59:00.112076067 +0200
@@ -0,0 +1,104 @@
+## Process this file with automake to generate Makefile.in
+#
+# Copyright (C) 2005, 2006, 2007, 2008 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
+
+AUTOMAKE_OPTIONS =
+
+if KPARTS4
+AM_CPPFLAGS = \
+ $(KDE4_CFLAGS) \
+ $(QT4_CFLAGS) \
+ $(X11_CFLAGS) \
+ -DGNASHBINDIR=\"${bindir}\"
+
+plugindir = $(KDE4_PLUGINDIR)
+kde_servicesdir = $(KDE4_SERVICESDIR)
+kde_rcdir = $(KDE4_APPSDATADIR)
+#$(prefix)/share/apps/klash
+kde_appsdatadir = $(KDE4_APPSDATADIR)
+#$(prefix)/share/apps/klash
+kde_configdir = $(KDE4_CONFIGDIR)
+#$(prefix)/share/config
+
+plugin_LTLIBRARIES= libklashpart.la
+
+libklashpart_la_SOURCES = klash_part.cpp klash_part.h
+libklashpart_la_DEPENDENCIES = klash_part.moc
+if PLUGIN_LINK_UNDEFINED
+libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir) @QTCORE@ @QTGUI@ @KDECORE@ @KDEUI@
+else
+libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) @QTCORE@ @QTGUI@ @KDECORE@ @KDEUI@
+endif
+
+dist_kde_services_DATA = klash_part.desktop
+dist_kde_rc_DATA = klashpartui.rc
+dist_kde_appsdata_DATA = pluginsinfo
+#dist_kde_config_DATA = klashrc
+
+# DIST_COMMON = $(dist_kde_appsdata_DATA) $(dist_kde_services_DATA) $(dist_kde_rc_DATA)
+
+BUILT_SOURCES = klash_part.moc
+CLEANFILES = klash_part.moc
+
+klash_part.moc: $(srcdir)/klash_part.h
+ $(MOC4) $(srcdir)/klash_part.h -o klash_part.moc;
+
+install-data: $(dist_kde_services_DATA)
+ test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
+ $(INSTALL) $(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+
+test_perms:
+ @if test ! -w $(DESTDIR)$(kde_appsdatadir) -o ! -w $(DESTDIR)$(kde_servicesdir); then \
+ if test -d $(DESTDIR)$(kde_appsdatadir); then \
+ echo "WARNING: Improper permissions for $(DESTDIR)$(kde_appsdatadir)!"; \
+ echo "You probably need to be root"; \
+ echo "Or configure with --with-kde-pluginprefix= set to a writable directory"; \
+ exit 1; \
+ fi; \
+ if test -d $(DESTDIR)$(kde_servicesdir); then \
+ echo "WARNING: Improper permissions for $(DESTDIR)$(kde_appsdatadir) and $(DESTDIR)$(kde_servicesdir)!"; \
+ echo "You probably need to be root"; \
+ echo "Or configure with --with-kde-pluginprefix= set to a writable directory"; \
+ exit 1; \
+ fi; \
+ fi
+
+install-data-am: $(dist_kde_services_DATA) $(dist_kde_appsdata_DATA)
+ test -d $(DESTDIR)$(kde_servicesdir) || $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)
+ $(INSTALL) $(srcdir)/$(dist_kde_services_DATA) $(DESTDIR)$(kde_servicesdir)
+ test -d $(DESTDIR)$(kde_appsdatadir) || $(mkinstalldirs) $(DESTDIR)$(kde_appsdatadir)
+ $(INSTALL) $(srcdir)/$(dist_kde_appsdata_DATA) $(DESTDIR)$(kde_appsdatadir)
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @echo "Nothing to install here now."
+ @echo "Use \"make install-plugin\" to install the KDE plugin to $(DESTDIR)$(plugindir)."
+
+install-plugin install-plugins: test_perms $(plugin_LTLIBRARIES) $(dist_kde_services_DATA) \
+ install-dist_kde_appsdataDATA install-dist_kde_rcDATA \
+ install-dist_kde_servicesDATA
+ test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) $(DESTDIR)$(plugindir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
+
+uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
+ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
+
+endif
+
+force:
+
+.PHONY : install-plugins install-plugin test_perms
--- gnash/plugin/klash4/pluginsinfo.kde4~ 2008-10-08 15:59:00.112076067 +0200
+++ gnash/plugin/klash4/pluginsinfo 2008-10-08 15:59:00.112076067 +0200
@@ -0,0 +1,7 @@
+number=1
+
+[0]
+description=Shockwave Flash 7.0
+file=libklashpart.so
+mime=application/x-shockwave-flash:swf:Shockwave Flash;application/futuresplash:spl:FutureSplash Player
+name=Shockwave Flash
--- gnash/plugin/klash4/README.kde4~ 2008-10-08 15:59:00.112076067 +0200
+++ gnash/plugin/klash4/README 2008-10-08 15:59:00.112076067 +0200
@@ -0,0 +1,5 @@
+Klash is a plugin for Konqueror, using the gnash binary from the Gnash
+project. As of this writing, you can only get it by checking it out their
+CVS repository. It should be newer than 2006-02-23, because that version
+has the -x option to embed in a window.
+You also need automake/autoconf and the SDL development.
--- gnash/plugin/Makefile.am.kde4~ 2008-10-07 13:30:16.000000000 +0200
+++ gnash/plugin/Makefile.am 2008-10-08 15:59:00.113075634 +0200
@@ -24,6 +24,10 @@ if KPARTS
SUBDIRS += klash
endif
+if KPARTS4
+SUBDIRS += klash4
+endif
+
if NPAPI
SUBDIRS += mozilla-sdk
@@ -41,7 +45,7 @@ endif
endif # NPAPI
# make sure these files make it into the distribution tarball.
-DIST_SUBDIRS = klash mozilla-sdk xpcom win32
+DIST_SUBDIRS = klash klash4 mozilla-sdk xpcom win32
# This is a hard coded path to where the plugin gets installed.
GNASHBINDIR = $(bindir)
@@ -132,6 +136,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLI
@echo "Use \"make install-plugin\" to install the Firefox plugin to $(DESTDIR)$(plugindir)."
if !WIN32
+if NPAPI
install-plugin: $(plugin_LTLIBRARIES)
@test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) "$(DESTDIR)$(plugindir)"
@echo "Installing plugin to $(DESTDIR)$(plugindir)"
@@ -140,6 +145,10 @@ install-plugin: $(plugin_LTLIBRARIES)
else \
cp -f libgnashplugin.so* $(DESTDIR)$(plugindir)/libgnashplugin.so; \
fi
+else # NPAPI
+install-plugin:
+ : # do nothing
+endif
else
install-plugin:
: # do nothing
@@ -147,6 +156,7 @@ endif # WIN32
install-plugins: install-plugin
$(MAKE) -C klash install-plugins
+ $(MAKE) -C klash4 install-plugins
$(MAKE) -C win32 install-plugins
uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
--- 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/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 9 Jul 2008 21:57:40 -0000 1.7
+++ .cvsignore 20 Oct 2008 19:40:07 -0000 1.8
@@ -1 +1,2 @@
-gnash-0.8.3.tar.gz
+gnash-0.8.4.tar.gz
+gnash-splash.swf
Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-9/gnash.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnash.spec 9 Oct 2008 01:33:24 -0000 1.25
+++ gnash.spec 20 Oct 2008 19:40:07 -0000 1.26
@@ -4,18 +4,22 @@
%define use_kde3_executable 1
Name: gnash
-Version: 0.8.3
-Release: 6%{?dist}
+Version: 0.8.4
+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
-Patch1: gnash-0.8.3-glib_link.patch
+# make autoreconf work
+Patch1: gnash-0.8.4-configure.patch
# patch by Benjamin Wolsey and Bernhard Rosenkränzer
-Patch2: gnash-0.8.3-port-to-kde4.patch
+Patch2: gnash-0.8.4-port-to-kde4.patch
# register KComponentData properly in KDE 4 KPart
Patch3: gnash-0.8.3-fix-kde4-port.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +43,9 @@
BuildRequires: %{_bindir}/docbook2pdf
BuildRequires: gstreamer-devel >= 0.10
BuildRequires: scrollkeeper
+BuildRequires: giflib-devel
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
# Need to autoreconf for the KDE 4 patch
BuildRequires: autoconf automake libtool
@@ -91,7 +98,7 @@
%prep
%setup -q
%patch0 -p1 -b .manual
-%patch1 -p1 -b .glib_link
+%patch1 -p1 -b .configure
%patch2 -p1 -b .kde4
%patch3 -p1 -b .fix-kde4
# handle the /usr/lib(64)/kde4/devel hack
@@ -106,7 +113,7 @@
sed -i -e 's/kde4-gnash/kde-gnash/g' plugin/klash4/klash_part.cpp
%endif
-chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
+#chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp}
iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
@@ -126,7 +133,6 @@
--enable-cygnal \
--enable-gui=gtk,kde,kde4,sdl,fb \
--disable-kparts \
- --with-qtdir=$QTDIR \
--with-qt4=%{_kde4_prefix} \
--with-kde4=%{_kde4_prefix}
%else
@@ -160,8 +166,9 @@
$RPM_BUILD_ROOT%{_libdir}/gnash/libgnashbase.so \
$RPM_BUILD_ROOT%{_libdir}/gnash/libgnashmedia.so \
$RPM_BUILD_ROOT%{_libdir}/gnash/libgnashnet.so \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashserver.so
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so*
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashcore.so \
+ $RPM_BUILD_ROOT%{_libdir}/gnash/libmozsdk.so*
+# $RPM_BUILD_ROOT%{_libdir}/gnash/libgnashserver.so
# $RPM_BUILD_ROOT%{_libdir}/libgnashbackend.so \
# $RPM_BUILD_ROOT%{_libdir}/libgnashgeo.so \
# $RPM_BUILD_ROOT%{_libdir}/libgnashgui.so \
@@ -170,10 +177,10 @@
#rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
# don't package libltdl related files!
-rm \
- $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
-rm \
- $RPM_BUILD_ROOT%{_includedir}/ltdl.h
+#rm \
+# $RPM_BUILD_ROOT%{_libdir}/gnash/libltdl*
+#rm \
+# $RPM_BUILD_ROOT%{_includedir}/ltdl.h
# info isn't generated rightly
#rm -rf \
# $RPM_BUILD_ROOT%{_infodir}/
@@ -181,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}/
@@ -195,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
@@ -218,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 || :
@@ -231,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
@@ -241,6 +286,7 @@
%config(noreplace) %{_sysconfdir}/gnashrc
%{_bindir}/dumpshm
%{_bindir}/fb-gnash
+%{_bindir}/flvdumper
%{_bindir}/gtk-gnash
%{_bindir}/sdl-gnash
%{_bindir}/soldumper
@@ -256,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
@@ -279,6 +328,18 @@
%{_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
+- add missing BR giflib-devel, gettext
+- omit unrecognized --with-qtdir
+
+* Sat Oct 18 2008 Patrice Dumas <pertusus at free.fr> 0.8.4-1
+- update to 0.8.4
+
* Thu Oct 4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.8.3-6
- use the KDE 3 executable with the KDE 4 KPart for now (making this conditional
so it can easily be disabled or removed once the KDE 4 executable is fixed)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 9 Jul 2008 21:57:40 -0000 1.7
+++ sources 20 Oct 2008 19:40:07 -0000 1.8
@@ -1 +1,2 @@
-126be87b3866abdd7a9ea32fcb44363e gnash-0.8.3.tar.gz
+3100e8d669795c03167a171937897c83 gnash-0.8.4.tar.gz
+3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf
--- gnash-0.8.3-glib_link.patch DELETED ---
--- gnash-0.8.3-port-to-kde4.patch DELETED ---
- Previous message: rpms/ptlib/devel .cvsignore, 1.3, 1.4 ptlib.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/opal/devel .cvsignore, 1.13, 1.14 opal.spec, 1.28, 1.29 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list