[gnash/gnash-git] Add patch to fix the check for perl in docbook.m4
Hicham HAOUARI
hicham at fedoraproject.org
Tue Feb 1 12:54:21 UTC 2011
commit e108dc54b26f70d01ae0d9f199dd4ea697d5538e
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Tue Feb 1 12:54:05 2011 +0000
Add patch to fix the check for perl in docbook.m4
0002-Fix-the-check-for-perl-in-docbook.m4.patch | 34 ++++++++++++++
gnash.spec | 56 ++++++++++++-----------
2 files changed, 63 insertions(+), 27 deletions(-)
---
diff --git a/0002-Fix-the-check-for-perl-in-docbook.m4.patch b/0002-Fix-the-check-for-perl-in-docbook.m4.patch
new file mode 100644
index 0000000..4f7cf77
--- /dev/null
+++ b/0002-Fix-the-check-for-perl-in-docbook.m4.patch
@@ -0,0 +1,34 @@
+From ce50ba498bbb4e170c4ad2565c199cec37ed0cd6 Mon Sep 17 00:00:00 2001
+From: Hicham HAOUARI <hicham.haouari at gmail.com>
+Date: Tue, 1 Feb 2011 12:52:51 +0000
+Subject: [PATCH 2/2] Fix the check for perl in docbook.m4
+
+---
+ macros/docbook.m4 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/macros/docbook.m4 b/macros/docbook.m4
+index 72937f5..e757b91 100644
+--- a/macros/docbook.m4
++++ b/macros/docbook.m4
+@@ -133,7 +133,7 @@ dnl [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+ for i in $scripts; do dnl## {
+ AC_PATH_PROG(DB2X_TEXI, $i, [], [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+ if test x$DB2X_TEXI != x; then
+- type="`file $DB2X_TEXI | grep -ic " perl " 2>&1`"
++ type="`file $DB2X_TEXI | grep -ic "perl " 2>&1`"
+ if test $type -gt 0; then
+ break
+ else
+@@ -159,7 +159,7 @@ dnl [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+ for i in $scripts; do
+ AC_PATH_PROG(DB2X_MAN, $i, [], [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+ if test x$DB2X_MAN != x; then
+- type="`file $DB2X_MAN | grep -ic " perl " 2>&1`"
++ type="`file $DB2X_MAN | grep -ic "perl " 2>&1`"
+ if test $type -gt 0; then
+ break
+ else
+--
+1.7.3.5
+
diff --git a/gnash.spec b/gnash.spec
index 333b02a..208616d 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -5,8 +5,8 @@
#global scrollkeeper 1
Name: gnash
-Version: 0.8.8
-Release: 4%{?dist}
+Version: 0.8.9
+Release: 0.1.%{gitdate}git%{?dist}
Epoch: 1
Summary: GNU flash movie player
@@ -19,11 +19,10 @@ 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
+
+# Remove superflous linkage in kde4 gnash
+Patch1: 0001-Remove-superfluous-linkage-in-kde4_gnash.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
@@ -47,6 +46,8 @@ BuildRequires: gstreamer-plugins-base-devel
BuildRequires: pygtk2-devel
BuildRequires: libtool-ltdl-devel
+BuildRequires: autconf automake libtool
+
%if 0%{?scrollkeeper}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
@@ -111,25 +112,8 @@ application.
%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]
+%patch1 -p1 -b .remove-superfluous-linkage
+
# 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)
@@ -140,14 +124,23 @@ iconv -f latin1 -t utf8 < AUTHORS > AUTHORS.utf8
touch -r AUTHORS AUTHORS.utf8
mv AUTHORS.utf8 AUTHORS
+# delete bundled libltdl stuff to make sure it's not used
+rm -f libltdl/*.[ch] libltdl/*/*.[ch]
+
%build
%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-jemalloc \
--enable-cygnal \
--enable-sdkinstall \
--enable-python \
--enable-gui=gtk,kde4,sdl,fb \
+ --enable-hwaccel=none \
+ --enable-renderer=all \
--with-kde4-prefix=%{_kde4_prefix} \
--with-kde4-lib=%{_kde4_libdir}/kde4/devel \
--with-kde4-incl=%{_kde4_includedir} \
@@ -169,6 +162,8 @@ make install install-plugins \
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
+# Remove .la file for the python module
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/gnash.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -rf __dist_docs
@@ -307,9 +302,16 @@ fi
%files -n python-gnash
%defattr(-,root,root,-)
-%{python_sitearch}/gtk-2.0/*
+%{python_sitearch}/gtk-2.0/gnash.so
%changelog
+* Sun Jan 30 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-0.1.20110130git
+- Switch to 0.8.9 branch
+- Remove the SEDs related to libltdl bundling
+- Drop the curl patches
+- Explicitly disable testsuite ( we don't have the necessary deps )
+- Enable jemalloc
+
* 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)
More information about the scm-commits
mailing list