Author: gotar Date: Fri Jan 13 11:43:46 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - builds with mozilla-firefox, but still crashes browser
---- Files affected: SPECS: gnash.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/gnash.spec diff -u SPECS/gnash.spec:1.1 SPECS/gnash.spec:1.2 --- SPECS/gnash.spec:1.1 Thu Jan 12 13:57:13 2006 +++ SPECS/gnash.spec Fri Jan 13 12:43:39 2006 @@ -17,11 +17,13 @@ BuildRequires: XFree86-devel BuildRequires: autoconf >= 2.50 BuildRequires: automake +BuildRequires: glut-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 BuildRequires: libxml2-devel +BuildRequires: mozilla-firefox-devel BuildRequires: scrollkeeper BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -53,23 +55,22 @@ %{__autoconf} %{__autoheader} %{__automake} +export PATH=/usr/lib/mozilla-firefox/:$PATH %configure \ - --disable-plugin \ --disable-static \ --enable-pthreads -# doesn't build with mozilla 1.7.x -# --with-firefox-includes=/usr/include/mozilla/plugin \ -# --with-firefox-libraries=%{_libdir} -%{__make} -# FIREFOX_CFLAGS="-I/usr/include/mozilla/plugin -I/usr/include/mozilla/java -I/usr/include/nspr" \ -# FIREFOX_PLUGINS=%{_libdir}/mozilla +%{__make} \ + FIREFOX_CFLAGS="-I/usr/include/mozilla-firefox/plugin -I/usr/include/mozilla-firefox/java -I/usr/include/nspr" \ + FIREFOX_PLUGINS=%{_libdir}/mozilla-firefox %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT -# FIREFOX_PLUGINS=%{_libdir}/mozilla + DESTDIR=$RPM_BUILD_ROOT \ + FIREFOX_PLUGINS=$RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins +install plugin/mozilla-sdk/.libs/libmozsdk.so.0.0.0 $RPM_BUILD_ROOT%{_libdir} # unusable rm -f $RPM_BUILD_ROOT%{_includedir}/*.h @@ -78,6 +79,9 @@ %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README @@ -86,6 +90,8 @@ %attr(755,root,root) %{_bindir}/gprocessor %dir %{_libdir}/gnash %attr(755,root,root) %{_libdir}/gnash/lib*.so.* +%attr(755,root,root) %{_libdir}/mozilla-firefox/plugins/* +%attr(755,root,root) %{_libdir}/lib*.so.* %{_datadir}/gnash %{_omf_dest_dir}/gnash @@ -95,5 +101,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2006/01/13 11:43:39 gotar +- builds with mozilla-firefox, but still crashes browser + Revision 1.1 2006/01/12 12:57:13 qboosh - new; mozilla/firefox plugin doesn't build with mozilla 1.7.x ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnash.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit