[gnash/f17] Update to 0.8.10

Tue Feb 28 09:10:46 UTC 2012

commit 049906b1a20579a6b52a83c225f7f03afd3b6de3
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Tue Feb 28 09:10:36 2012 +0000

    Update to 0.8.10

 .gitignore                                         |    1 +
 ...r.patch => gnash-0.8.10-add-unistd-header.patch |    0
 ...oy-movieroot-before-clearing-moviefactory.patch |   29 ------
 gnash-0.8.9-fix-handlers-vector-length.patch       |   22 -----
 gnash-0.8.9-scripting-support-fixes.patch          |   96 --------------------
 gnash-0.8.9-xulrunner-headers.patch                |   26 ------
 gnash.spec                                         |   44 +++------
 sources                                            |    2 +-
 8 files changed, 16 insertions(+), 204 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b8d324c..43c3a46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gnash-0.8.7.tar.bz2
 /gnash-d60ec8e556cf9034b69101866896dbb4ccac53ef.tar.gz
 /gnash-0.8.9.tar.gz
 /gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch
+/gnash-0.8.10.tar.bz2
diff --git a/gnash-0.8.9-add-unistd-header.patch b/gnash-0.8.10-add-unistd-header.patch
similarity index 100%
rename from gnash-0.8.9-add-unistd-header.patch
rename to gnash-0.8.10-add-unistd-header.patch
diff --git a/gnash.spec b/gnash.spec
index 3255a38..366653b 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -2,15 +2,15 @@
 %filter_setup
 
 Name:           gnash
-Version:        0.8.9
-Release:        9%{?dist}
+Version:        0.8.10
+Release:        1%{?dist}
 Epoch:          1
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://www.gnu.org/software/gnash/
-Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnu.org/gnu/%{name}/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
@@ -26,31 +26,15 @@ BuildRequires:  speex-devel gstreamer-plugins-base-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel
 BuildRequires:  xulrunner-devel
+BuildRequires:  GConf2-devel
 
 BuildRequires:  autoconf automake libtool
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-# Patch0:       https://bugzilla.redhat.com/show_bug.cgi?id=691699
-#               http://savannah.gnu.org/bugs/?32950
-#               http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=c291348
-Patch0:         %{name}-%{version}-fix-handlers-vector-length.patch
-
-#Patch1:        https://bugzilla.redhat.com/show_bug.cgi?id=692779
-#               https://savannah.gnu.org/bugs/?32579
-#               http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=3d603f0
-Patch1:         %{name}-%{version}-destroy-movieroot-before-clearing-moviefactory.patch
-
-#Patch2:        https://bugzilla.redhat.com/show_bug.cgi?id=691370
-#               http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=48337fb
-Patch2:         %{name}-%{version}-scripting-support-fixes.patch
-
-# http://git.savannah.gnu.org/gitweb/?p=gnash.git;a=commit;h=35dde18
-Patch3:         %{name}-%{version}-xulrunner-headers.patch
-
-# Patch4 :      http://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg338792.html
-Patch4:         %{name}-%{version}-add-unistd-header.patch
+# Patch0 :      http://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg338792.html
+Patch0:         %{name}-%{version}-add-unistd-header.patch
 
 %description
 Gnash is capable of reading up to SWF v9 files and op-codes, but primarily
@@ -143,11 +127,7 @@ to a MySQL database. The API is similar to the standard MySQL one.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-handlers-vector-length
-%patch1 -p1 -b .destroy-movieroot-before-clearing-moviefactory
-%patch2 -p1 -b .scripting-support-fixes
-%patch3 -p1 -b .npapi-const
-%patch4 -p1 -b .unistd-header
+%patch0 -p1 -b .unistd-header
 autoreconf -if
 
 %build
@@ -172,7 +152,7 @@ make %{?_smp_mflags}
 %install
 make install install-plugins \
  DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf '{}' \;
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
@@ -251,12 +231,12 @@ touch --no-create %{_datadir}/icons/hicolor
 %doc COPYING
 %{_datadir}/applications/klash.desktop
 %{_bindir}/gnash-qt-launcher
-%{_kde4_bindir}/kde4-gnash
+%{_kde4_bindir}/qt4-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/qt4-gnash.1*
 %{_mandir}/man1/gnash-qt-launcher.1*
 
 %files cygnal
@@ -304,6 +284,10 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
+* Mon Feb 27 2012 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.10-1
+- Update to 0.8.10
+- Drop patches backported from upstream
+
 * Thu Jan 26 2012 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-9
 - Add unistd.h header ( http://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg338792.html )
 - Backport patch from upstream that replaces xulrunner-headers patch 
diff --git a/sources b/sources
index f67d9d9..8d37288 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01d0420932eede07211e368d405aee9c  gnash-0.8.9.tar.gz
+63e9f79c41d93d48c5a2fa94856548c4  gnash-0.8.10.tar.bz2
