[gnash/gnash-git] New snapshot

Wed Mar 9 22:49:49 UTC 2011

commit 25364a6039f573e0562e65601985a0bd4f92b9ef
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Wed Mar 9 22:47:56 2011 +0000

    New snapshot

 .gitignore                 |    2 +
 0001-Use-system-ltdl.patch |  231 --------------------------------------------
 gnash.spec                 |   44 +++++----
 sources                    |    3 +-
 4 files changed, 28 insertions(+), 252 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4f2a1e5..e06679b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ gnash-0.8.7.tar.bz2
 /gnash-0.8.9-20110223git.tar.bz2
 /gnash-0.8.9-20110226git.tar.bz2
 /gnash-0.8.9-20110228git.tar.bz2
+/gnash-3f40103aa6461b8f40b2ec2b258c745200fd19f4.tar.gz
+/0002-Add-missing-aliases-to-gnash.1-man-page.patch
diff --git a/gnash.spec b/gnash.spec
index 4bc926d..e91e7bb 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -1,4 +1,6 @@
-%define gitdate 20110228
+%define gitdate 20110309
+%define commit 3f40103aa6461b8f40b2ec2b258c745200fd19f4
+
 %filter_provides_in %{python_sitearch}/.*\.so$ 
 %filter_setup
 
@@ -11,18 +13,18 @@ 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
-Source0:        %{name}-%{version}-%{gitdate}git.tar.bz2
+Source0:        http://git.savannah.gnu.org/cgit/gnash.git/snapshot/%{name}-%{commit}.tar.gz
 
-Patch0:         0001-Use-system-ltdl.patch
+# Patch0:       https://savannah.gnu.org/patch/?7492
+Patch0:         0002-Add-missing-aliases-to-gnash.1-man-page
 
 BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  boost-devel curl-devel freetype-devel fontconfig-devel
 BuildRequires:  SDL-devel agg-devel
-BuildRequires:  kde-filesystem kdelibs-devel
+BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel pygtk2-devel
-BuildRequires:  docbook2X gettext
-BuildRequires:  %{_bindir}/docbook2pdf
+BuildRequires:  docbook2X gettext fop xmltex
+BuildRequires:  docbook-utils-pdf
 BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  giflib-devel
 BuildRequires:  desktop-file-utils
@@ -30,6 +32,7 @@ BuildRequires:  speex-devel gstreamer-plugins-base-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  dejagnu
 BuildRequires:  mysql-devel
+BuildRequires:  xulrunner-devel
 
 BuildRequires:  autoconf automake libtool
 
@@ -91,7 +94,7 @@ application.
 %package extension-fileio
 Summary:   Fileio extension for Gnash
 Group:     Applications/Multimedia
-Requires:  gnash
+Requires:  %{name} = %{epoch}:%{version}-%{release}
 
 %description extension-fileio
 This extension allows SWF files being played within Gnash to have direct access
@@ -100,7 +103,7 @@ 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:  gnash
+Requires:  %{name} = %{epoch}:%{version}-%{release}
 
 %description extension-lirc
 This extension allows SWF files being played within Gnash to have direct access
@@ -110,7 +113,7 @@ LIRC one.
 %package extension-dejagnu
 Summary:   DejaGnu extension for Gnash
 Group:     Applications/Multimedia
-Requires:  gnash
+Requires:  %{name} = %{epoch}:%{version}-%{release}
 
 %description extension-dejagnu
 This extension allows SWF files to have a simple unit testing API. The API
@@ -119,7 +122,7 @@ is similar to the DejaGnu unit testing one.
 %package extension-mysql
 Summary:   MySQL extension for Gnash
 Group:     Applications/Multimedia
-Requires:  gnash
+Requires:  %{name} = %{epoch}:%{version}-%{release}
 
 %description extension-mysql
 This extension allows SWF files being played within Gnash to have direct access
@@ -127,7 +130,7 @@ to a MySQL database. The API is similar to the standard MySQL one.
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-system-ltdl
+%patch0 -p1 -b .add-missing-manpage-aliases
 
 autoreconf -if
 
@@ -145,7 +148,8 @@ autoreconf -if
   --with-plugins-install=system \
   --enable-doublebuf \
   --disable-jemalloc \
-  --enable-extensions=fileio,lirc,dejagnu,mysql
+  --enable-extensions=fileio,lirc,dejagnu,mysql \
+  --htmldir=%{_datadir}/doc/%{name}-%{version}
 
 make %{?_smp_mflags}
 
@@ -155,11 +159,6 @@ make install install-plugins \
 
 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
-
 %find_lang %{name}
 
 %check
@@ -201,7 +200,8 @@ touch --no-create %{_datadir}/icons/hicolor
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
-%doc __dist_docs/*
+%doc %{_datadir}/doc/%{name}-%{version}/gnash*.html
+%doc %{_datadir}/doc/%{name}-%{version}/images
 %config(noreplace) %{_sysconfdir}/gnashpluginrc
 %config(noreplace) %{_sysconfdir}/gnashrc
 %{_bindir}/fb-gnash
@@ -224,6 +224,9 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_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/
@@ -246,6 +249,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_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,-)
@@ -288,7 +292,7 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
-* Mon Feb 28 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110228git
+* Wed Mar 09 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110309git
 - Switch to 0.8.9 branch
 
 * Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:0.8.8-4
diff --git a/sources b/sources
index 7b9a800..f5a0d00 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-15eeecd00ff604805d5853d77755730c  gnash-0.8.9-20110228git.tar.bz2
+3c00dc3d6fa00ba677fd0648be9aad0a  gnash-3f40103aa6461b8f40b2ec2b258c745200fd19f4.tar.gz
+de153154b1c847c4f9c5dca6d7b20fd3  0002-Add-missing-aliases-to-gnash.1-man-page.patch
