#
# TODO:
+# - with new gcc version (it is possible that)
+# - -fvisibility=hiddenn and ac_cv_visibility_pragma=no can be removed
+# - with new firefox version (it is possible that)
+# - -fno-strict-aliasing can be removed (needs to be tested carefuly,
+# not to be fixed soon, imho)
# - handle locales differently (runtime, since it's possible to do)
# - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
# for hints how to make locales and other stuff like extensions working
-# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x.
+# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x.
+#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
%bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui)
Summary(pl): Mozilla Firefox - przegl±darka WWW
Name: mozilla-firefox
Version: 1.5.0.1
-Release: 1
+Release: 2
License: MPL/LGPL
Group: X11/Applications/Networking
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
Patch2: %{name}-nss-system-nspr.patch
Patch3: %{name}-nopangoxft.patch
Patch4: %{name}-name.patch
+Patch5: %{name}-dumpstack.patch
+Patch6: %{name}-pango-typo.patch
# UPDATE or DROP?
-#PatchX: %{name}-searchplugins.patch
+#PatchX: %{name}-searchplugins.patch
URL: http://www.mozilla.org/projects/firefox/
%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
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
-%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0}
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: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.6-0.20041030.1
-BuildRequires: nss-devel >= 3.8
+BuildRequires: nspr-devel >= 1:4.6.1
+BuildRequires: nss-devel >= 3.10.2
BuildRequires: pango-devel >= 1:1.6.0
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
BuildRequires: zip
Requires: %{name}-lang-resources = %{version}
-Requires: nspr >= 1:4.6-0.20041030.1
-Requires: nss >= 3.8
-# for /etc/ld.so.conf.d
-Requires: glibc >= 6:2.3.5-7.6
-Requires(post,postun): /sbin/ldconfig
+Requires: nspr >= 1:4.6.1
+Requires: nss >= 3.10.2
Provides: wwwbrowser
Obsoletes: mozilla-firebird
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%package devel
Summary: Headers for developing programs that will use Mozilla Firefox
-Summary(pl): Mozilla Firefox - pliki nag³ówkowe i biblioteki
+Summary(pl): Mozilla Firefox - pliki nag³ówkowe
Group: X11/Development/Libraries
-Obsoletes: mozilla-devel
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.6-0.20041030.1
+Requires: nspr-devel >= 1:4.6.1
+Obsoletes: mozilla-devel
%description devel
-Mozilla development package.
+Mozilla Firefox development package.
%description devel -l pl
-Biblioteki i pliki nag³ówkowe.
+Pliki nag³ówkowe przegl±darki Mozilla Firefox.
%package lang-en
-Summary: English resources for Mozilla-firefox
-Summary(pl): Anglojêzyczne zasoby dla Mozilla-FireFox
+Summary: English resources for Mozilla Firefox
+Summary(pl): Anglojêzyczne zasoby dla przegl±darki Mozilla Firefox
Group: X11/Applications/Networking
Requires(post,postun): %{name} = %{version}-%{release}
Requires(post,postun): textutils
Provides: %{name}-lang-resources = %{version}-%{release}
%description lang-en
-English resources for Mozilla-firefox
+English resources for Mozilla Firefox.
%description lang-en -l pl
-Anglojêzyczne zasoby dla Mozilla-FireFox
+Anglojêzyczne zasoby dla przegl±darki Mozilla Firefox.
%prep
%setup -q -n mozilla
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p0
+%patch6 -p0
sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
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}" \
+ CC="%{__cc} -fno-strict-aliasing -fvisibility=hidden" \
CXX="%{__cxx}"
%install
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
$RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
# extensions dir is needed (it can be empty)
-
+
%{__make} -C xpinstall/packager \
MOZ_PKG_APPNAME="mozilla-firefox" \
MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \
EXCLUDE_NSPR_LIBS=1
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-#grep locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-en-US-installed-chrome.txt
-#grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-misc-installed-chrome.txt
-
rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki
rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
ln -sf %{_includedir}/mozilla-firefox/necko/nsIURI.h \
$RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
-
+
# CA certificates
ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_firefoxdir}/libnssckbi.so
sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
-# includedir/dom CFLAGS
+# includedir/dom CFLAGS
sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \
$RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc
-
+
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
#!/bin/sh
umask 022
-#There is no such files (*-installed-chrome.txt). IMO obsolete.
-#cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt
rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
MOZILLA_FIVE_HOME=%{_firefoxdir}
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
%{_sbindir}/firefox-chrome+xpcom-generate
%banner %{name} -e <<EOF
###################################################################
EOF
%postun
-/sbin/ldconfig
if [ "$1" != "0" ]; then
%{_sbindir}/firefox-chrome+xpcom-generate
fi
rm -rf %{_firefoxdir}/extensions
fi
-#%post lang-en
-#umask 022
-#cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
-
-#%postun lang-en
-#umask 022
-#cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
-
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mozilla*
#%{_firefoxdir}/chrome/content-packs.jar
# -dom-inspector subpackage?
#%{_firefoxdir}/chrome/inspector.jar
-#%{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
%dir %{_firefoxdir}/chrome/icons
%{_firefoxdir}/chrome/icons/default
%defattr(644,root,root,755)
%{_firefoxdir}/chrome/en-US.jar
%{_firefoxdir}/chrome/en-US.manifest
-#%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt
projects / packages / firefox.git / blobdiff