Author: pluto Date: Mon Apr 28 14:30:49 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - fix amd64 build, install konq. plugin.
---- Files affected: SPECS: gnash.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: SPECS/gnash.spec diff -u SPECS/gnash.spec:1.24 SPECS/gnash.spec:1.25 --- SPECS/gnash.spec:1.24 Tue Apr 8 10:24:51 2008 +++ SPECS/gnash.spec Mon Apr 28 16:30:44 2008 @@ -1,5 +1,8 @@ # $Revision$, $Date$ # +# TODO: +# - port BR:scrollkeeper -> rarian +# # Conditional build: %bcond_without kde # don't build klash plugin for Konqueror %bcond_with tests # nothing yet @@ -14,6 +17,7 @@ Source0: http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2 # Source0-md5: 05cac831181be3fb40cbf3c00ab25c0f Patch0: %{name}-system-libltdl.patch +Patch1: %{name}-lib64.patch URL: http://www.gnu.org/software/gnash/ BuildRequires: agg-devel BuildRequires: atk-devel >= 1.0 @@ -44,7 +48,8 @@ BuildRequires: libxml2-devel >= 2.0 BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: scrollkeeper +#see TODO. +#BuildRequires: scrollkeeper BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXft-devel BuildRequires: xorg-lib-libXi-devel @@ -111,6 +116,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # contains libtool.m4 copy rm macros/libltdl.m4 @@ -135,7 +141,8 @@ --enable-media=gst \ --enable-pthreads \ --enable-visibility \ - --with-plugindir=%{_browserpluginsdir} + --with-npapi-plugindir=%{_browserpluginsdir} + %{__make} \ pluginsdir=%{_libdir}/gnash/plugins @@ -146,7 +153,7 @@ DESTDIR=$RPM_BUILD_ROOT \ pluginsdir=%{_libdir}/gnash/plugins -%{__make} -C plugin install-plugin \ +%{__make} install-plugins \ DESTDIR=$RPM_BUILD_ROOT # useless without --enable-sdk-install, which does nothing atm @@ -206,6 +213,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2008-04-28 14:30:44 pluto +- fix amd64 build, install konq. plugin. + Revision 1.24 2008-04-08 08:24:51 glen - unify ftp.gnu.org urls ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnash.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
