X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=34ed8a418b941a6682d8f1385fad9c9fe56db66c;hb=f6c84fecd9923975c4d88d99227f90955c72c59b;hp=71e369944137b4c0934b031881cb1d28bf15e2f7;hpb=505f4c220a589122d539e553c39b9a9653d857e2;p=packages%2Ffirefox.git diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 71e3699..34ed8a4 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -1,62 +1,80 @@ # # TODO: # - handle locales differently (runtime, since it's possible to do) -# - move most of %%post to external script as it's done in debian # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff* # for hints how to make locales and other stuff like extensions working +# - security http://secunia.com/advisories/15292/ # # Conditional build: %bcond_with tests # enable tests (whatever they check) +%bcond_with ft218 # compile with freetype >= 2.1.8 # Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przegl±darka WWW Name: mozilla-firefox -Version: 0.9.3 -Release: 0.2 +Version: 1.0.3 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking -Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2 -# Source0-md5: 641ebf96d2211b3c5527e88389b9687e +Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 +# Source0-md5: f1a9a8da0547564a0f8a249f9d56bdf4 Source1: %{name}.desktop +Source2: %{name}.sh Patch0: %{name}-alpha-gcc3.patch -Patch1: %{name}-nspr.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 -BuildRequires: gtk+2-devel >= 2.0.0 +%if %{with ft218} +BuildRequires: freetype-devel >= 1:2.1.9 +%else +BuildRequires: freetype-devel >= 2.1.3 +BuildRequires: freetype-devel < 1:2.1.8 +BuildConflicts: freetype-devel = 2.1.8 +%endif +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.5.0 +BuildRequires: nspr-devel >= 1:4.6-0.20041030.1 BuildRequires: nss-devel >= 3.8 BuildRequires: pango-devel >= 1:1.1.0 +BuildRequires: perl-modules +BuildRequires: pkgconfig BuildRequires: zip +BuildRequires: heimdal-devel Requires: %{name}-lang-resources = %{version} -Requires: nspr >= 1:4.5.0 +%if %{with ft218} +Requires: freetype >= 1:2.1.3 +%else +Requires: freetype >= 2.1.3 +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 +%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 compliance, performance and portability. %description -l pl -Mozilla Firefox jest open sourcow± przegl±dark± sieci www, stworzon± z -my¶l± o zgodno¶ci ze standartami, wydajno¶ci± i przeno¶no¶ci±. +Mozilla Firefox jest open sourcow± przegl±dark± sieci WWW, stworzon± z +my¶l± o zgodno¶ci ze standardami, wydajno¶ci± i przeno¶no¶ci±. %package lang-en Summary: English resources for Mozilla-firefox Summary(pl): Anglojêzyczne zasoby dla Mozilla-FireFox -Group: X11/Applications/Networking +Group: X11/Applications/Networking Requires(post,postun): %{name} = %{version}-%{release} Requires(post,postun): textutils Requires: %{name} = %{version}-%{release} @@ -74,16 +92,19 @@ Angloj %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%{?with_ft218:%patch4 -p1} +sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure %build export CFLAGS="%{rpmcflags}" export CXXFLAGS="%{rpmcflags}" export MOZ_PHOENIX="1" +export BUILD_OFFICIAL="1" +export MOZILLA_OFFICIAL="1" -cp -f /usr/share/automake/config.* build/autoconf -cp -f /usr/share/automake/config.* nsprpub/build/autoconf -cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf +cp -f %{_datadir}/automake/config.* build/autoconf +cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf +cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf %configure2_13 \ %if %{?debug:1}0 --enable-debug \ @@ -116,28 +137,32 @@ cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf --enable-xft \ --enable-default-toolkit="gtk2" \ --with-pthreads \ - --with-system-jpeg \ --with-system-nspr \ + --with-system-jpeg \ --with-system-png \ - --with-system-zlib + --with-system-zlib \ + --enable-single-profile \ + --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" \ MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \ EXCLUDE_NSPR_LIBS=1 -#install -m0755 %{name}.sh $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -ln -sf %{_firefoxdir}/firefox $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +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 -install browser/base/skin/Throbber.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png +install other-licenses/branding/firefox/content/icon32.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png #install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/ #install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/US/ @@ -149,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 @@ -168,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 @@ -228,18 +226,19 @@ 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 %{_firefoxdir}/defaults -%{_firefoxdir}/ipc +%{_firefoxdir}/greprefs +%dir %{_firefoxdir}/init.d %attr(755,root,root) %{_firefoxdir}/*.so %attr(755,root,root) %{_firefoxdir}/*.sh %attr(755,root,root) %{_firefoxdir}/m* @@ -260,18 +259,18 @@ 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 %defattr(644,root,root,755) %{_firefoxdir}/chrome/en-US.jar -%{_firefoxdir}/chrome/en-unix.jar -%{_firefoxdir}/chrome/US.jar %{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt