X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=28ada85c3213435fd0970c6b341d072e1d41a4aa;hb=34dd92dda52630e040a8620f96a7436b3f75b5d7;hp=37c69dc83a758550b7b81c4c6c63f8a4359701c1;hpb=948d138517fffa968ab56312be8c8b1c3c7bb133;p=packages%2Ffirefox.git diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 37c69dc..28ada85 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -3,7 +3,6 @@ # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff* # for hints how to make locales # - make it more pld-like (bookmarks, default page etc..) -# - add dictionaries outside of mozilla # # Conditional build: %bcond_with tests # enable tests (whatever they check) @@ -12,18 +11,20 @@ Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 2.0.0.1 -Release: 3.1 +Version: 2.0.0.4 +Release: 1 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 -# Source0-md5: 7a1fc804ed735c5b7e9b1498bac8b5db +# Source0-md5: 99c14794976b2532addfcd2d836c6bb2 Source1: %{name}.desktop Source2: %{name}.sh Patch0: mozilla-install.patch Patch1: %{name}-lib_path.patch Patch3: %{name}-nopangoxft.patch Patch5: %{name}-fonts.patch +Patch69: %{name}-agent.patch +Patch7: %{name}-myspell.patch # if ac rebuild is needed... #PatchX: %{name}-ac.patch URL: http://www.mozilla.org/projects/firefox/ @@ -32,13 +33,14 @@ BuildRequires: automake BuildRequires: cairo-devel >= 1.0.0 %{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0} BuildRequires: gtk+2-devel >= 1:2.0.0 -BuildRequires: heimdal-devel >= 0.7.1 +BuildRequires: krb5-devel BuildRequires: libIDL-devel >= 0.8.0 %{?with_gnome:BuildRequires: libgnome-devel >= 2.0} %{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0} 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 @@ -62,20 +64,24 @@ Provides: wwwbrowser Obsoletes: mozilla-firebird BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# mozilla and firefox provide their own versions -%define _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so +# firefox/thunderbird/seamonkey provide their own versions +%define _noautoreqdep libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so %define _noautoprovfiles %{_libdir}/%{name}/components +# we don't want these to satisfy xulrunner-devel +%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so +# and as we don't provide them, don't require either +%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so -%define specflags -fno-strict-aliasing -fno-tree-vrp +%define specflags -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector %description Firefox Community Edition is an open-source web browser, designed for standards compliance, performance and portability. %description -l pl.UTF-8 -Firefox Community Edition jest open sourcową przeglądarką sieci WWW, -stworzoną z myślą o zgodności ze standardami, wydajnością i -przenośnością. +Firefox Community Edition jest przeglądarką WWW rozpowszechnianą +zgodnie z ideami ruchu otwartego oprogramowania oraz tworzoną z myślą +o zgodności ze standardami, wydajnością i przenośnością. %package libs Summary: Firefox Community Edition shared libraries @@ -109,8 +115,8 @@ cd mozilla %patch1 -p1 %patch3 -p1 %patch5 -p1 - -sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure +%patch7 -p1 +%patch69 -p1 # use system #rm -rf mozilla/nsprpub mozilla/security/nss @@ -171,6 +177,7 @@ ac_add_options --disable-updater 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 @@ -204,7 +211,6 @@ install -d \ # 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 @@ -213,7 +219,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res 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 @@ -221,12 +226,15 @@ ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d 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 @@ -260,8 +268,11 @@ EOF %clean rm -rf $RPM_BUILD_ROOT -%pre -for d in chrome defaults dictionaries extensions greprefs icons init.d res searchplugins; do +%pretrans +if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then + mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave} +fi +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 @@ -323,7 +334,6 @@ fi %dir %{_datadir}/%{name} %{_datadir}/%{name}/chrome %{_datadir}/%{name}/defaults -%{_datadir}/%{name}/dictionaries %{_datadir}/%{name}/greprefs %{_datadir}/%{name}/icons %{_datadir}/%{name}/init.d @@ -349,6 +359,3 @@ fi %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