Author: glen Date: Sun Mar 4 20:26:25 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - use system myspell; rel 2
---- Files affected: SPECS: mozilla-firefox.spec (1.160.2.10 -> 1.160.2.11) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.160.2.10 SPECS/mozilla-firefox.spec:1.160.2.11 --- SPECS/mozilla-firefox.spec:1.160.2.10 Sun Feb 25 02:51:11 2007 +++ SPECS/mozilla-firefox.spec Sun Mar 4 21:26:20 2007 @@ -14,7 +14,7 @@ Summary(pl): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox Version: 2.0.0.2 -Release: 1 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -25,8 +25,9 @@ Patch1: %{name}-lib_path.patch Patch3: %{name}-nopangoxft.patch Patch5: %{name}-fonts.patch +Patch6: %{name}-myspell.patch # if ac rebuild is needed... -#PatchX: %{name}-ac.patch +#PatchX: %{name}-ac.patch URL: http://www.mozilla.org/projects/firefox/ %{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: XFree86-devel @@ -41,6 +42,7 @@ BuildRequires: libjpeg-devel >= 6b BuildRequires: libpng-devel >= 1.2.7 BuildRequires: libstdc++-devel +BuildRequires: myspell-devel BuildRequires: nspr-devel >= 1:4.6.3 BuildRequires: nss-devel >= 1:3.11.3-3 BuildRequires: pango-devel >= 1:1.6.0 @@ -106,6 +108,7 @@ %patch1 -p1 %patch3 -p1 %patch5 -p1 +%patch6 -p1 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure @@ -168,6 +171,7 @@ ac_add_options --enable-default-toolkit=gtk2 ac_add_options --enable-svg ac_add_options --enable-system-cairo +ac_add_options --enable-system-myspell ac_add_options --enable-xft ac_add_options --with-distribution-id=org.pld-linux ac_add_options --with-system-nspr @@ -201,7 +205,6 @@ # move arch independant ones to datadir mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons @@ -210,7 +213,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults -ln -s ../../share/%{name}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons @@ -218,12 +220,15 @@ ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins +#rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries +ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries + sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop # header/development files rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl @@ -258,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT %pre -for d in chrome defaults dictionaries extensions greprefs icons init.d res searchplugins; do +for d in chrome defaults extensions greprefs icons init.d res searchplugins; do if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then install -d %{_datadir}/%{name} mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d @@ -320,7 +325,6 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/chrome %{_datadir}/%{name}/defaults -%{_datadir}/%{name}/dictionaries %{_datadir}/%{name}/greprefs %{_datadir}/%{name}/icons %{_datadir}/%{name}/init.d @@ -346,9 +350,6 @@ %defattr(644,root,root,755) %{_datadir}/%{name}/chrome/en-US.jar %{_datadir}/%{name}/chrome/en-US.manifest -# probably should share these with all mozilla apps -%{_datadir}/%{name}/dictionaries/en-US.aff -%{_datadir}/%{name}/dictionaries/en-US.dic %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -356,6 +357,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.160.2.11 2007/03/04 20:26:20 glen +- use system myspell; rel 2 + Revision 1.160.2.10 2007/02/25 01:51:11 glen - revert utf8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.160.2.10&r2=1.160.2.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
