X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=37f3fec94e15ca9b865fa1fe369cb5e0f03dca02;hb=1bb006846158d074b8bd2ed7593e64de40bfe97a;hp=ecb4e0011cc094a38f3555d10a9fa21250576b74;hpb=652a4d8df89a89efb94061a5916dddab5a96bfc9;p=packages%2Ffirefox.git diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index ecb4e00..37f3fec 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -13,18 +13,19 @@ Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przegl±darka WWW Name: mozilla-firefox -Version: 1.0 -Release: 0.rc1.1 +Version: 1.0.1 +Release: 1 License: MPL/LGPL Group: X11/Applications/Networking -Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0rc1/firefox-1.0rc1-source.tar.bz2 -# Source0-md5: 7a0411859fc5d5f647e211c24beaf94b +Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 +# Source0-md5: ebaea974fea9460ab7050fff76b41cb1 Source1: %{name}.desktop Source2: %{name}.sh Patch0: %{name}-alpha-gcc3.patch -Patch1: %{name}-nss.patch -Patch2: %{name}-lib_path.patch -Patch3: %{name}-freetype.patch +Patch1: %{name}-gfx.patch +Patch2: %{name}-nss.patch +Patch3: %{name}-lib_path.patch +Patch4: %{name}-freetype.patch URL: http://www.mozilla.org/projects/firefox/ BuildRequires: automake %if %{with ft218} @@ -34,13 +35,16 @@ BuildRequires: freetype-devel >= 2.1.3 BuildRequires: freetype-devel < 1:2.1.8 BuildConflicts: freetype-devel = 2.1.8 %endif -BuildRequires: gtk+2-devel >= 2.0.0 +BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: libIDL-devel >= 0.8.0 BuildRequires: libjpeg-devel >= 6b BuildRequires: libpng-devel >= 1.2.0 BuildRequires: libstdc++-devel +BuildRequires: nspr-devel >= 1:4.6-0.20041030.1 BuildRequires: nss-devel >= 3.8 BuildRequires: pango-devel >= 1:1.1.0 +BuildRequires: perl(Time::localtime) +BuildRequires: pkgconfig BuildRequires: zip Requires: %{name}-lang-resources = %{version} %if %{with ft218} @@ -50,15 +54,15 @@ Requires: freetype >= 2.1.3 Requires: freetype < 1:2.1.8 Conflicts: freetype = 2.1.8 %endif +Requires: nspr >= 1:4.6-0.20041030.1 Requires: nss >= 3.8 -PreReq: XFree86-Xvfb Obsoletes: mozilla-firebird BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _firefoxdir %{_libdir}/%{name} # mozilla and firefox provide their own versions -%define _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libnspr4.so -%define _noautoprovfiles libnspr4.so libplc4.so libplds4.so +%define _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so +%define _noautoprovfiles libplc4.so libplds4.so %description Mozilla Firefox is an open-source web browser, designed for standards @@ -88,7 +92,8 @@ Angloj %patch0 -p1 %patch1 -p1 %patch2 -p1 -%{?with_ft218:%patch3 -p1} +%patch3 -p1 +%{?with_ft218:%patch4 -p1} %build export CFLAGS="%{rpmcflags}" @@ -132,18 +137,20 @@ cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf --enable-xft \ --enable-default-toolkit="gtk2" \ --with-pthreads \ - --without-system-nspr \ + --with-system-nspr \ --with-system-jpeg \ --with-system-png \ --with-system-zlib \ --enable-single-profile \ - --disable-profilesharing + --disable-profilesharing \ + --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth + %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} %{__make} -C xpinstall/packager \ MOZ_PKG_APPNAME="mozilla-firefox" \ @@ -151,6 +158,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} EXCLUDE_NSPR_LIBS=1 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +sed -i $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -e "s@/usr/lib/@%{_libdir}/@g" tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*-linux-gnu.tar.gz @@ -166,14 +174,12 @@ grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_ rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki toolkit rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar -%clean -rm -rf $RPM_BUILD_ROOT - -%post +cat << EOF > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate +#!/bin/sh umask 022 cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt - -unset MOZILLA_FIVE_HOME || : +rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf} +rm -f %{_firefoxdir}/components/{compreg,xpti}.dat MOZILLA_FIVE_HOME=%{_firefoxdir} export MOZILLA_FIVE_HOME @@ -185,53 +191,28 @@ export PATH LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH -/sbin/ldconfig || : - -%{_firefoxdir}/regxpcom >/dev/null || echo "E: regxpcom was exited: $?" >&2 -%{_firefoxdir}/regchrome >/dev/null || echo "E: regchrome was exited: $?" >&2 - -TDIR=`mktemp -d /tmp/mozilla-firefox-pkg.XXXXXX` || exit 1 -HOME="$TDIR" -export TDIR HOME - -mkdir -p $TDIR/.mozilla/firefox/default -cp -rf %{_firefoxdir}/defaults/profile/* $TDIR/.mozilla/firefox/default - -# preseed profiles.ini -cat > $TDIR/.mozilla/firefox/profiles.ini </dev/null 2>&1 & \ - xvfb_pid=${!}; \ - DISPLAY=:69 %{_firefoxdir}/firefox-bin -list-global-items >/dev/null 2>&1 & \ - sleep 15; \ - kill ${xvfb_pid} >/dev/null 2>&1 \ -) - -rm -rf $TDIR +%post +%{_sbindir}/firefox-chrome+xpcom-generate %postun if [ "$1" != "0" ]; then - umask 022 - cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt + %{_sbindir}/firefox-chrome+xpcom-generate fi %preun if [ "$1" == "0" ]; then - rm -rf %{_firefoxdir}/chrome/overlayinfo - rm -rf %{_firefoxdir}/components - rm -f %{_firefoxdir}/chrome/*.rdf - rm -rf %{_firefoxdir}/extensions + rm -rf %{_firefoxdir}/chrome/overlayinfo + rm -f %{_firefoxdir}/chrome/*.rdf + rm -rf %{_firefoxdir}/components + rm -rf %{_firefoxdir}/extensions fi %post lang-en @@ -245,13 +226,13 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_sbindir}/* %dir %{_firefoxdir} %{_firefoxdir}/res %dir %{_firefoxdir}/components %attr(755,root,root) %{_firefoxdir}/components/*.so %{_firefoxdir}/components/*.js %{_firefoxdir}/components/*.xpt -%{_firefoxdir}/components/myspell %{_firefoxdir}/plugins %{_firefoxdir}/searchplugins %{_firefoxdir}/icons @@ -278,14 +259,15 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe #%{_firefoxdir}/chrome/chatzilla.jar %{_firefoxdir}/chrome/classic.jar %{_firefoxdir}/chrome/comm.jar -%{_firefoxdir}/chrome/content-packs.jar +#%{_firefoxdir}/chrome/content-packs.jar %{_firefoxdir}/chrome/help.jar # -dom-inspector subpackage? -#%{_firefoxdir}/chrome/inspector.jar +%{_firefoxdir}/chrome/inspector.jar %{_firefoxdir}/chrome/modern.jar %{_firefoxdir}/chrome/pip*.jar %{_firefoxdir}/chrome/toolkit.jar %{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt +%dir %{_firefoxdir}/chrome/icons %{_firefoxdir}/chrome/icons/default %files lang-en