gnash: update to 0.8.10

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7658 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnash/gnash-vl.spec

@@ -8,19 +8,19 @@
 %define kde_support 0
 
 Name:           gnash
-Version:        0.8.7
-Release:	5%{?_dist_release}
+Version:        0.8.10
+Release:	1%{?_dist_release}
 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
+
+Patch0:         %{name}-%{version}-add-unistd-header.patch
+Patch1:         %{name}-%{version}-integer-overflow.patch
 
 # register KComponentData properly in KDE 4 KPart
-Patch0:         gnash-0.8.3-fix-kde4-port.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -50,6 +50,14 @@ BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  pygtk2-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:	dejagnu
+BuildRequires:  GConf2-devel
+BuildRequires:  xulrunner-devel
+BuildRequires:  autoconf automake libtool
+BuildRequires:  libboost-devel
+BuildRequires:  libboost-program-options
+BuildRequires:  libboost-iostreams
+BuildRequires:  mesa-libGLU-devel
+BuildRequires:  libXmu-devel
 
 %if %{scrollkeeper}
 Requires(post): scrollkeeper
@@ -122,35 +130,18 @@ application.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-kde4
-%if %{kde_support}
-# 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
-%endif
-# 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]
-
-iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
-touch -r AUTHORS AUTHORS.utf8
-mv AUTHORS.utf8 AUTHORS
+%patch0 -p1 -b .unistd-header
+%patch1 -p1 -b .integer-overflow
+autoreconf -if
 
 %build
-%configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
+%configure --disable-static \
+  --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
   --enable-docbook --enable-ghelp --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
+  --disable-testsuite \
+  --without-swfdec-testsuite \
+  --without-ming \
   --enable-cygnal \
   --enable-sdkinstall \
   --enable-python \
@@ -162,7 +153,11 @@ mv AUTHORS.utf8 AUTHORS
 %else
   --enable-gui=gtk,sdl,fb \
 %endif
-  --without-included-ltdl
+  --enable-renderer=all \
+  --with-plugins-install=system \
+  --disable-jemalloc \
+  --enable-doublebuf \
+  --htmldir=%{_datadir}/gnash/html
 
 %if %{kde_support}
 # make sure the Qt 4 moc etc. tools are found
@@ -195,38 +190,6 @@ 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
-
-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
-
 %find_lang %{name}
 
 %clean
@@ -272,15 +235,13 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc __dist_docs/*
 %config(noreplace) %{_sysconfdir}/gnashpluginrc
 %config(noreplace) %{_sysconfdir}/gnashrc
-%{_bindir}/dumpshm
 %{_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
@@ -288,21 +249,18 @@ fi
 %dir %{_libdir}/gnash
 %{_libdir}/gnash/*.so*
 %{_mandir}/man1/gnash.1*
-%{_mandir}/man1/dumpshm.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}/icons/hicolor/32x32/apps/*.xpm
 %{_datadir}/applications/*.desktop
-%{_libexecdir}/gnash-wrapper
-%if %{scrollkeeper}
-%{_datadir}/omf/gnash/
-%endif
 
 %files plugin
 %defattr(-,root,root,-)
@@ -322,8 +280,11 @@ fi
 %defattr(-,root,root,-)
 %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*
 
@@ -337,6 +298,9 @@ fi
 %{python_sitearch}/gtk-2.0/*
 
 %changelog
+* Mon Apr 22 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.10-1
+- update to 0.8.10
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.7-5
 - rebuild with python-2.7.2
 
@@ -471,14 +435,14 @@ fi
 * Sat Oct 18 2008 Patrice Dumas <pertusus@free.fr> 0.8.4-1
 - update to 0.8.4
 
-* Thu Oct  4 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.3-6
+* Sat Oct  4 2008 Kevin Kofler <Kevin@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)
 
-* Thu Oct  4 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.3-5
+* Sat Oct  4 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.3-5
 - register KComponentData properly in KDE 4 KPart
 
-* Wed Oct  3 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.3-4
+* Fri Oct  3 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.3-4
 - KDE 4 port of klash by Benjamin Wolsey and Bernhard Rosenkränzer
 
 * Fri Aug 29 2008 Michael Schwendt <mschwendt@fedoraproject.org> 0.8.3-3
@@ -524,7 +488,7 @@ fi
 * Wed May  9 2007 Patrice Dumas <pertusus@free.fr> 0.7.2-2
 - fix CVE-2007-2500 (fix 239213)
 
-* Sat Nov  6 2006 Patrice Dumas <pertusus@free.fr> 0.7.2-1
+* Mon Nov  6 2006 Patrice Dumas <pertusus@free.fr> 0.7.2-1
 - update for 0.7.2 release.
 
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 0.7.1-9