[gnash] Update to 0.8.9 snapshot
Hicham HAOUARI
hicham at fedoraproject.org
Sun Mar 13 16:10:02 UTC 2011
commit 5e7008c668c38b3d64d4fdcdde59de052977a962
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sun Mar 13 16:09:38 2011 +0000
Update to 0.8.9 snapshot
.gitignore | 1 +
gnash-0.8.3-fix-kde4-port.patch | 12 --
gnash-0.8.8-libcurl721-DNS-resolving.patch | 28 ---
gnash-0.8.8-libcurl721-FD_ZERO.patch | 37 ----
gnash.desktop | 11 -
gnash.spec | 274 +++++++++++++---------------
sources | 3 +-
7 files changed, 128 insertions(+), 238 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17b2d79..44e6dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gnash-splash.swf
gnash-0.8.7.tar.bz2
/gnash-0.8.8.tar.bz2
+/gnash-d60ec8e556cf9034b69101866896dbb4ccac53ef.tar.gz
diff --git a/gnash.spec b/gnash.spec
index 1953d0d..6fed4e7 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -1,63 +1,43 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define gitdate 20110312
+%define commit d60ec8e556cf9034b69101866896dbb4ccac53ef
-# uncomment to enable ghelp/omf/scrollkeeper support
-# not working as of version 0.8.7
-#global scrollkeeper 1
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_setup
Name: gnash
-Version: 0.8.8
-Release: 5%{?dist}
+Version: 0.8.9
+Release: 0.1.%{gitdate}git%{?dist}
Epoch: 1
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.bz2
-Source1: http://www.getgnash.org/gnash-splash.swf
-Source2: gnash.desktop
-
-# register KComponentData properly in KDE 4 KPart
-Patch0: gnash-0.8.3-fix-kde4-port.patch
-# upstream patches:
-# FD_ZERO should not be called between curl_multi_fset and select
-Patch100: gnash-0.8.8-libcurl721-FD_ZERO.patch
-# give more time to DNS resolving so we can still connect with libcurl >= 7.21.x
-Patch101: gnash-0.8.8-libcurl721-DNS-resolving.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://git.savannah.gnu.org/cgit/gnash.git/snapshot/%{name}-%{commit}.tar.gz
BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
BuildRequires: boost-devel curl-devel freetype-devel fontconfig-devel
-BuildRequires: SDL-devel
-BuildRequires: agg-devel
-BuildRequires: kde-filesystem
+BuildRequires: SDL-devel agg-devel
BuildRequires: kdelibs-devel
-BuildRequires: gtkglext-devel
-BuildRequires: docbook2X
-BuildRequires: %{_bindir}/docbook2pdf
+BuildRequires: gtkglext-devel pygtk2-devel
+BuildRequires: docbook2X gettext fop xmltex
+BuildRequires: docbook-utils-pdf
BuildRequires: gstreamer-devel >= 0.10
-%if 0%{?scrollkeeper}
-BuildRequires: scrollkeeper
-%endif
BuildRequires: giflib-devel
-BuildRequires: gettext
BuildRequires: desktop-file-utils
-BuildRequires: speex-devel
-BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: pygtk2-devel
+BuildRequires: speex-devel gstreamer-plugins-base-devel
BuildRequires: libtool-ltdl-devel
+BuildRequires: dejagnu
+BuildRequires: mysql-devel
+BuildRequires: xulrunner-devel
+
+BuildRequires: autoconf automake libtool
-%if 0%{?scrollkeeper}
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
-%endif
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
%description
-Gnash is capable of reading up to SWF v9 files and opcodes, but primarily
+Gnash is capable of reading up to SWF v9 files and op-codes, but primarily
supports SWF v7, with better SWF v8 and v9 support under heavy development.
Gnash includes initial parser support for SWF v8 and v9. Not all
ActionScript 2 classes are implemented yet, but all of the most heavily
@@ -72,7 +52,7 @@ Requires: mozilla-filesystem%{?_isa} webclient
Group: Applications/Internet
%description plugin
-The gnash flash movie player plugin for firefox or mozilla.
+The gnash flash movie player plugin for Firefox or Mozilla.
%package klash
Summary: Konqueror flash movie player plugin
@@ -108,112 +88,78 @@ Group: Applications/Multimedia
Python bindings for the Gnash widget. Can be used to embed Gnash into any PyGTK
application.
+%package extension-fileio
+Summary: Fileio extension for Gnash
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extension-fileio
+This extension allows SWF files being played within Gnash to have direct access
+to the file system. The API is similar to the C library one.
+
+%package extension-lirc
+Summary: LIRC extension for Gnash
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extension-lirc
+This extension allows SWF files being played within Gnash to have direct access
+to a LIRC based remote control device. The API is similar to the standard
+LIRC one.
+
+%package extension-dejagnu
+Summary: DejaGnu extension for Gnash
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extension-dejagnu
+This extension allows SWF files to have a simple unit testing API. The API
+is similar to the DejaGnu unit testing one.
+
+%package extension-mysql
+Summary: MySQL extension for Gnash
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extension-mysql
+This extension allows SWF files being played within Gnash to have direct access
+to a MySQL database. The API is similar to the standard MySQL one.
+
%prep
-%setup -q
-%patch0 -p1 -b .fix-kde4
-%patch100 -p1 -b .libcurl721-FD_ZERO
-%patch101 -p1 -b .libcurl721-DNS-resolving
-# Hack as autoreconf breaks build
-sed -i -e 's!kapp.h!kapplication.h!g' configure
-sed -i -e 's!libkdeui.la!libkdeui.so!g' configure
-# Currently kde4-gnash (from kde4 branch) links against various KDE libraries,
-# but only needs Qt -- remove the superfluous linkage
-sed -i -e 's!\$(KDE4_LIBS)!!g' gui/Makefile.in
-# we don't want any builtin ltdl built, configure wants always either
-# ltdl-install or ltdl-convenience, hack that out
-sed -i -e 's/test x"\${enable_ltdl_convenience-no}" != xno/false/g' configure
-# and don't build the loader part of libltdl either
-sed -i -e 's/\$(LT_DLLOADERS)//g' libltdl/Makefile.in
-# link to the system libltdl instead of the bundled one
-# this is hardcoded in the makefiles, so --without-included-ltdl doesn't help
-sed -i -e 's!\$(top_builddir)/libltdl/libltdlc.la!-lltdl!g' \
- */Makefile.in */*/Makefile.in
-# delete bundled libltdl stuff to make sure it's not used
-rm -f libltdl/*.[ch] libltdl/*/*.[ch]
-# fix the check for the docbook2X tools being in Perl
-sed -i -e 's/" perl "/"perl "/g' configure
-# fix a typo in the doc generation (FTBFS #631181)
-sed -i -e 's/gnashref.texi gnash_user.texi/gnashref.texi gnash_ref.texi/g' \
- doc/C/Makefile.in
-
-iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
-touch -r AUTHORS AUTHORS.utf8
-mv AUTHORS.utf8 AUTHORS
+%setup -q -n %{name}-%{commit}
+autoreconf -if
%build
%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
- --enable-docbook --enable-ghelp --enable-media=GST \
+ --enable-docbook --disable-ghelp --enable-media=GST \
--disable-dependency-tracking --disable-rpath \
+ --enable-testsuite \
+ --without-swfdec-testsuite \
+ --without-ming \
--enable-cygnal \
- --enable-sdkinstall \
--enable-python \
--enable-gui=gtk,kde4,sdl,fb \
- --with-kde4-prefix=%{_kde4_prefix} \
- --with-kde4-lib=%{_kde4_libdir}/kde4/devel \
- --with-kde4-incl=%{_kde4_includedir} \
- --without-included-ltdl
-# make sure the Qt 4 moc etc. tools are found
-export PATH=%{_qt4_prefix}/bin:$PATH
-#doesn't work currently: %%{?_smp_mflags}
-# override KDE4_LIBS because configure doesn't detect it properly
-make KDE4_LIBS='-L%{_kde4_libdir}/kde4/devel -lkparts -lkdeui -lkdecore'
+ --enable-renderer=all \
+ --with-plugins-install=system \
+ --enable-doublebuf \
+ --disable-jemalloc \
+ --enable-extensions=fileio,lirc,dejagnu,mysql \
+ --htmldir=%{_datadir}/gnash/html
+
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install install-plugins \
- DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' \
- KDE4_PLUGINDIR=%{_kde4_libdir}/kde4 \
- KDE4_SERVICESDIR=%{_kde4_datadir}/kde4/services \
- KDE4_CONFIGDIR=%{_kde4_configdir} \
- KDE4_APPSDATADIR=%{_kde4_appsdir}/klash
-rm $RPM_BUILD_ROOT%{_libdir}/gnash/*.la
-# KDE 4 doesn't need the .la file anymore, thankfully
-rm $RPM_BUILD_ROOT%{_kde4_libdir}/kde4/libklashpart.la
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-
-rm -rf __dist_docs
-mkdir __dist_docs
-mv $RPM_BUILD_ROOT%{_datadir}/doc/gnash/* __dist_docs/
-rmdir $RPM_BUILD_ROOT%{_datadir}/doc/gnash
-
-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.
-# FIXME: Do we still need this with 0.8.7?
-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
+ DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-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/apps
-cp -p ./gui/images/GnashG.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%check
+make check
%post
-/sbin/ldconfig
-%if 0%{?scrollkeeper}
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-%endif
/sbin/install-info %{_infodir}/gnash_ref.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/gnash_user.info %{_infodir}/dir || :
@@ -224,6 +170,9 @@ if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+%post klash
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
%preun
if [ $1 = 0 ]; then
@@ -232,11 +181,6 @@ if [ $1 = 0 ]; then
fi
%postun
-/sbin/ldconfig
-%if 0%{?scrollkeeper}
-scrollkeeper-update -q || :
-%endif
-
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
@@ -244,19 +188,20 @@ if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+%postun klash
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS COPYING NEWS
-%doc __dist_docs/*
%config(noreplace) %{_sysconfdir}/gnashpluginrc
%config(noreplace) %{_sysconfdir}/gnashrc
%{_bindir}/fb-gnash
-%{_bindir}/flvdumper
%{_bindir}/gtk-gnash
+%{_bindir}/gnash-gtk-launcher
%{_bindir}/rtmpget
%{_bindir}/sdl-gnash
-%{_bindir}/soldumper
%{_bindir}/gnash
%{_bindir}/gprocessor
%{_bindir}/findmicrophones
@@ -265,53 +210,86 @@ fi
%{_libdir}/gnash/*.so*
%{_mandir}/man1/gnash.1*
%{_mandir}/man1/gprocessor.1*
-%{_mandir}/man1/soldumper.1*
-%{_mandir}/man1/flvdumper.1*
%{_mandir}/man1/findmicrophones.1*
%{_mandir}/man1/findwebcams.1*
%{_mandir}/man1/gtk-gnash.1*
+%{_mandir}/man1/gnash-gtk-launcher.1*
+%{_mandir}/man1/fb-gnash.1*
+%{_mandir}/man1/sdl-gnash.1*
+%{_mandir}/man1/rtmpget.1*
%{_infodir}/gnash*
%{_datadir}/gnash/
-%{_datadir}/icons/hicolor/32x32/apps/*.png
-%{_datadir}/applications/*.desktop
-%{_libexecdir}/gnash-wrapper
-%if 0%{?scrollkeeper}
-%{_datadir}/omf/gnash/
-%endif
+%{_datadir}/icons/hicolor/32x32/apps/gnash.xpm
+%{_datadir}/applications/gnash.desktop
%files plugin
%defattr(-,root,root,-)
+%doc COPYING
%{_libdir}/mozilla/plugins/libgnashplugin.so
%files klash
%defattr(-,root,root,-)
+%doc COPYING
+%{_datadir}/applications/klash.desktop
+%{_bindir}/gnash-qt-launcher
%{_kde4_bindir}/kde4-gnash
%{_kde4_libdir}/kde4/libklashpart.so
%{_kde4_appsdir}/klash/
%{_kde4_datadir}/kde4/services/klash_part.desktop
+%{_datadir}/icons/hicolor/32x32/apps/klash.xpm
%{_mandir}/man1/kde4-gnash.1*
+%{_mandir}/man1/gnash-qt-launcher.1*
%files cygnal
%defattr(-,root,root,-)
+%doc COPYING
%config(noreplace) %{_sysconfdir}/cygnalrc
%{_bindir}/cygnal
+%{_bindir}/flvdumper
+%{_bindir}/soldumper
%{_mandir}/man1/cygnal.1*
-%{_mandir}/man1/rtmpget.1*
+%{_mandir}/man1/flvdumper.1*
+%{_mandir}/man1/soldumper.1*
%dir %{_libdir}/cygnal
%{_libdir}/cygnal/plugins/*.so*
%files devel
%defattr(-,root,root,-)
+%doc COPYING
%{_includedir}/gnash/
%{_libdir}/pkgconfig/gnash.pc
%files -n python-gnash
%defattr(-,root,root,-)
-%{python_sitearch}/gtk-2.0/*
+%doc COPYING
+%{python_sitearch}/gtk-2.0/gnash.so
+
+%files extension-fileio
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/gnash/plugins/fileio.so
+
+%files extension-lirc
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/gnash/plugins/lirc.so
+
+%files extension-dejagnu
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/gnash/plugins/dejagnu.so
+
+%files extension-mysql
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/gnash/plugins/mysql.so
%changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Mar 12 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110312git
+- Switch to 0.8.9 branch
+- Spec cleanup
+- Add extensions
+- Enable testsuite
* Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.8-4
- backport 2 upstream commits to make it work with libcurl >= 7.21.x (#639737)
diff --git a/sources b/sources
index b727811..2c24af1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3ba3f30fbcd9ac6458c7d50a33eb933e gnash-splash.swf
-ce57f66e222f7eb1adf7f7b4a1274612 gnash-0.8.8.tar.bz2
+73042c43206a5c6e085fd00a34484e91 gnash-d60ec8e556cf9034b69101866896dbb4ccac53ef.tar.gz
More information about the scm-commits
mailing list