Summary: Mozilla Firefox web browser
Summary(pl): Mozilla Firefox - przegl±darka WWW
Name: mozilla-firefox
-Version: 1.5.0.1
-Release: 4
+Version: 1.5.0.7
+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: c76f02956645bc823241379e27f76bb5
+# Source0-md5: 518cbd99a3fe663237070013e5cdb1a4
Source1: %{name}.desktop
Source2: %{name}.sh
Patch0: %{name}-nss.patch
Patch2: %{name}-nss-system-nspr.patch
Patch3: %{name}-nopangoxft.patch
Patch4: %{name}-name.patch
-Patch5: %{name}-dumpstack.patch
-Patch6: %{name}-pango-typo.patch
+Patch5: %{name}-fonts.patch
# UPDATE or DROP?
#PatchX: %{name}-searchplugins.patch
URL: http://www.mozilla.org/projects/firefox/
%{?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
-BuildRequires: nss-devel >= 3.10.2
+BuildRequires: nspr-devel >= 1:4.6.1-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
-Requires: nss >= 3.10.2
+Requires: nspr >= 1:4.6.1-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)
%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
Summary(pl): Mozilla Firefox - pliki nag³ówkowe
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.6.1
+Requires: nspr-devel >= 1:4.6.1-2
Obsoletes: mozilla-devel
%description devel
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 -p0
-%patch6 -p0
+%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`"
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
ac_add_options --with-system-nspr
ac_add_options --with-system-png
ac_add_options --with-system-zlib
+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}} \
$RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
# extensions dir is needed (it can be empty)
-ln -s firefox %{_bindir}/mozilla-firefox
-install %{_bindir}/mozilla-firefox firefox
+ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
%{__make} -C xpinstall/packager \
MOZ_PKG_APPNAME="mozilla-firefox" \
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
%post
%{_sbindir}/firefox-chrome+xpcom-generate
-%banner %{name} -e <<EOF
-###################################################################
-# #
-# NOTICE: #
-# If you have problem with upgrade old mozilla-firefox 1.0.x, you #
-# should remove it first. #
-# #
-###################################################################
-EOF
%postun
-if [ "$1" != "0" ]; then
- %{_sbindir}/firefox-chrome+xpcom-generate
-fi
-
-%preun
-if [ "$1" == "0" ]; then
+if [ "$1" = "0" ]; then
rm -rf %{_firefoxdir}/chrome/overlayinfo
rm -f %{_firefoxdir}/chrome/*.rdf
rm -rf %{_firefoxdir}/components
rm -rf %{_firefoxdir}/extensions
fi
+%triggerpostun -- %{name} < 1.5
+%banner %{name} -e <<EOF
+NOTICE:
+If you have problem with upgrade from old mozilla-firefox 1.0.x,
+you should remove it first and reinstall %{name}-%{version}
+EOF
+
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mozilla*
%attr(755,root,root) %{_firefoxdir}/components/*.so
%{_firefoxdir}/components/*.js
%{_firefoxdir}/components/*.xpt
-%{_firefoxdir}/plugins
+%dir %{_firefoxdir}/plugins
+%attr(755,root,root) %{_firefoxdir}/plugins/*.so
%{_firefoxdir}/searchplugins
%{_firefoxdir}/icons
%{_firefoxdir}/defaults
projects / packages / firefox.git / blobdiff