- no branding

[packages/firefox.git] / mozilla-firefox.spec

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index b3710e8382d3db9c2d12df1ce0bf729a85ece4a1..2ba5bbe1f780e4bc45bbcc67668214069821a6ed 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -17,12 +17,12 @@
 Summary:       Mozilla Firefox web browser
 Summary(pl):   Mozilla Firefox - przegl±darka WWW
 Name:          mozilla-firefox
-Version:       1.5.0.2
-Release:       2
+Version:       1.5.0.8
+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: 6bd65d899e9bcb16c28225899cc61a1e
+# Source0-md5: 86f98df1586efb419225a2988a217951
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-nss.patch
@@ -30,6 +30,7 @@ Patch1:               %{name}-lib_path.patch
 Patch2:                %{name}-nss-system-nspr.patch
 Patch3:                %{name}-nopangoxft.patch
 Patch4:                %{name}-name.patch
+Patch5:                %{name}-fonts.patch
 # UPDATE or DROP?
 #PatchX:       %{name}-searchplugins.patch
 URL:           http://www.mozilla.org/projects/firefox/
@@ -43,18 +44,24 @@ 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.0
+BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: libstdc++-devel
 BuildRequires: nspr-devel >= 1:4.6.1-2
-BuildRequires: nss-devel >= 3.10.2
+BuildRequires: nss-devel >= 1:3.11.3
 BuildRequires: pango-devel >= 1:1.6.0
 BuildRequires: perl-modules >= 5.004
 BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel >= 2.1
+BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXp-devel
 BuildRequires: xorg-lib-libXt-devel
 BuildRequires: zip
+BuildRequires: zlib-devel >= 1.2.3
 Requires:      %{name}-lang-resources = %{version}
 Requires:      nspr >= 1:4.6.1-2
-Requires:      nss >= 3.10.2
+Requires:      nss >= 1:3.11.3
+Requires(post):        mktemp >= 1.5-18
 Provides:      wwwbrowser
 Obsoletes:     mozilla-firebird
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,7 +69,8 @@ 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                _noautoprovfiles        libplc4.so libplds4.so
+
+%define                specflags       -fno-strict-aliasing
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
@@ -102,16 +110,19 @@ English resources for Mozilla Firefox.
 Anglojêzyczne zasoby dla przegl±darki Mozilla Firefox.
 
 %prep
-%setup -q -n mozilla
+%setup -qc
+cd mozilla
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %build
+cd mozilla
 rm -f .mozconfig
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
@@ -122,8 +133,8 @@ cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
 
-cat << EOF > .mozconfig
-. \$topsrcdir/browser/config/mozconfig
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
@@ -188,11 +199,12 @@ ac_cv_visibility_pragma=no
 EOF
 
 %{__make} -j1 -f client.mk build \
-       CC="%{__cc} -fno-strict-aliasing" \
+       CC="%{__cc}" \
        CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mozilla
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
        $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
@@ -267,8 +279,10 @@ LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 unset TMPDIR TMP || :
+export HOME=$(mktemp -d)
 MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom
 MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register
+rm -rf $HOME
 EOF
 
 %clean
@@ -318,7 +332,7 @@ EOF
 %attr(755,root,root) %{_firefoxdir}/reg*
 %attr(755,root,root) %{_firefoxdir}/x*
 %{_pixmapsdir}/*
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 
 %dir %{_firefoxdir}/chrome
 %{_firefoxdir}/chrome/*.jar