+# NOTE: PLD distributes iceweasel instead
#
# TODO:
-# - 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
# - (12:22:58) patrys: can you also move _libdir/mozilla-firefox to just _libdir/firefox?
# (12:23:25) patrys: it's not like we ship official firefox
# - fix wrapper script to allow playing with profiles (must not use -remote)
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
-%bcond_without gnomeui # disable gnomeui support
-%bcond_without gnomevfs # disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
-%bcond_without gnome # disable all GNOME components (gnome+gnomeui+gnomevfs)
+%bcond_with gtk3 # GTK+ 3.x instead of 2.x
%bcond_without kerberos # disable krb5 support
-%bcond_with xulrunner # build with system xulrunner
+%bcond_with xulrunner # system xulrunner [no longer supported]
+%bcond_with shared_js # shared libmozjs library
-%if %{without gnome}
-%undefine with_gnomeui
-%undefine with_gnomevfs
+%if %{without xulrunner}
+# The actual sqlite version (see RHBZ#480989):
+%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
%endif
+%define nspr_ver 4.10.8
+%define nss_ver 3.18.1
+
Summary: Firefox Community Edition web browser
Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
Name: mozilla-firefox
-Version: 3.0.7
+Version: 38.0.1
Release: 1
-License: MPL 1.1 or GPL v2+ or LGPL v2.1+
+License: MPL v2.0
Group: X11/Applications/Networking
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 9875c9237b532009df8e91c3785539a3
-Source1: %{name}.desktop
-Source2: %{name}.sh
-Patch0: %{name}-install.patch
-Patch1: %{name}-gcc3.patch
-Patch2: %{name}-agent.patch
-Patch3: %{name}-agent-ac.patch
-Patch4: %{name}-ti-agent.patch
-Patch5: %{name}-branding.patch
-Patch6: %{name}-prefs.patch
-Patch7: %{name}-nss_cflags.patch
+Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
+# Source0-md5: 3c496e4ec072327b1ef2b820f15dff26
+Source3: %{name}.desktop
+Source4: %{name}.sh
+Source5: vendor.js
+Source6: vendor-ac.js
+Patch0: %{name}-branding.patch
+Patch7: %{name}-prefs.patch
+Patch9: %{name}-no-subshell.patch
+Patch11: %{name}-middle_click_paste.patch
+Patch12: %{name}-packaging.patch
+Patch13: %{name}-system-virtualenv.patch
+Patch15: %{name}-Disable-Firefox-Health-Report.patch
URL: http://www.mozilla.org/projects/firefox/
-%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
+BuildRequires: OpenGL-devel
+BuildRequires: alsa-lib-devel
BuildRequires: automake
-BuildRequires: cairo-devel >= 1.6.0
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel >= 1.10.2-5
BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: glib2-devel
-%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
-BuildRequires: gtk+2-devel >= 2:2.10
-%if "%{pld_release}" == "ac"
+BuildRequires: freetype-devel >= 1:2.1.8
+BuildRequires: gcc-c++ >= 6:4.4
+BuildRequires: glib2-devel >= 1:2.22
+BuildRequires: gstreamer-devel >= 1.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0
+%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.18.0}
+%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.4.0}
%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
-%else
-%{?with_kerberos:BuildRequires: krb5-devel}
-%endif
+BuildRequires: hunspell-devel >= 1.2.3
BuildRequires: libIDL-devel >= 0.8.0
-%{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0}
-%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
+# DECnet (dnprogs.spec), not dummy net (libdnet.spec)
+#BuildRequires: libdnet-devel
+BuildRequires: libevent-devel >= 1.4.7
+# standalone libffi 3.0.9 or gcc's from 4.5(?)+
+BuildRequires: libffi-devel >= 6:3.0.9
+BuildRequires: libicu-devel >= 50.1
+# requires libjpeg-turbo implementing at least libjpeg 6b API
BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 1.2.7
-BuildRequires: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.7
-BuildRequires: nss-devel >= 1:3.12-2
-BuildRequires: pango-devel >= 1:1.10.0
+BuildRequires: libpng-devel >= 2:1.6.16
+BuildRequires: libstdc++-devel >= 6:4.4
+BuildRequires: libvpx-devel >= 1.3.0
+BuildRequires: nspr-devel >= 1:%{nspr_ver}
+BuildRequires: nss-devel >= 1:%{nss_ver}
+BuildRequires: pango-devel >= 1:1.22.0
+BuildRequires: pixman-devel >= 0.19.2
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
-BuildRequires: python-modules
-BuildRequires: sqlite3-devel >= 3.5.9
+BuildRequires: pkgconfig(libffi) >= 3.0.9
+BuildRequires: pulseaudio-devel
+BuildRequires: python-modules >= 1:2.5
+BuildRequires: python-simplejson
+BuildRequires: python-virtualenv >= 1.9.1-4
+BuildRequires: readline-devel
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: startup-notification-devel
-%if "%{pld_release}" == "ac"
-BuildRequires: XFree86-devel
-%else
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: sqlite3-devel >= 3.8.9
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libXScrnSaver-devel
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
-%endif
%if %{with xulrunner}
-BuildRequires: xulrunner-devel >= 1.9-2
+BuildRequires: xulrunner-devel >= 2:%{version}
%endif
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
Requires(post): mktemp >= 1.5-18
-%if %{without xulrunner}
Requires: browser-plugins >= 2.0
-%endif
-Requires: cairo >= 1.6.0
-Requires: gtk+2 >= 2:2.10
-Requires: libpng(APNG) >= 0.10
-Requires: nspr >= 1:4.7
-Requires: nss >= 1:3.12-2
-Requires: pango >= 1:1.10.0
-Requires: sqlite3 >= 3.5.9
+Requires: desktop-file-utils
+Requires: hicolor-icon-theme
%if %{with xulrunner}
%requires_eq_to xulrunner xulrunner-devel
+%else
+Requires: cairo >= 1.10.2-5
+Requires: dbus-glib >= 0.60
+Requires: glib2 >= 1:2.22
+%{!?with_gtk3:Requires: gtk+2 >= 2:2.18.0}
+%{?with_gtk3:Requires: gtk+3 >= 3.4.0}
+Requires: libjpeg-turbo
+Requires: libpng >= 2:1.6.16
+Requires: libpng(APNG) >= 0.10
+Requires: libvpx >= 1.3.0
+Requires: myspell-common
+Requires: nspr >= 1:%{nspr_ver}
+Requires: nss >= 1:%{nss_ver}
+Requires: pango >= 1:1.22.0
+Requires: sqlite3 >= %{sqlite_build_version}
+Requires: startup-notification >= 0.8
%endif
Provides: wwwbrowser
Obsoletes: mozilla-firebird
Obsoletes: mozilla-firefox-lang-en < 2.0.0.8-3
Obsoletes: mozilla-firefox-libs
+Conflicts: mozilla-firefox-lang-resources < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
+
# don't satisfy other packages (don't use %{name} here)
%define _noautoprovfiles %{_libdir}/mozilla-firefox
+%if %{without xulrunner}
# and as we don't provide them, don't require either
-%define _noautoreq libmozjs.so libxpcom.so libxul.so libjemalloc.so
-
-%if "%{cc_version}" >= "3.4"
-%define specflags -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
-%else
-%define specflags -fno-strict-aliasing
+%define _noautoreq libmozalloc.so libmozjs.so libxul.so
%endif
%description
o zgodności ze standardami, wydajnością i przenośnością.
%prep
-%setup -qc -n %{name}-%{version}
+%setup -qc
+mv -f mozilla-release mozilla
cd mozilla
-%patch0 -p1
-
-%if "%{cc_version}" < "3.4"
-%patch1 -p2
-%endif
-
-%if "%{pld_release}" == "th"
-%patch2 -p1
-%endif
-
-%if "%{pld_release}" == "ac"
-%patch3 -p1
-%endif
-
-%if "%{pld_release}" == "ti"
-%patch4 -p1
-%endif
-%patch5 -p1
-%patch6 -p1
+%patch0 -p1
%patch7 -p1
+%patch9 -p2
+%patch11 -p2
+%patch12 -p1
+%patch13 -p2
+%patch15 -p1
%build
cd mozilla
-cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
+cp -pf %{_datadir}/automake/config.* build/autoconf
cat << 'EOF' > .mozconfig
. $topsrcdir/browser/config/mozconfig
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
# Options for 'configure' (same as command-line options).
+ac_add_options --build=%{_target_platform}
+ac_add_options --host=%{_target_platform}
ac_add_options --prefix=%{_prefix}
ac_add_options --exec-prefix=%{_exec_prefix}
ac_add_options --bindir=%{_bindir}
ac_add_options --disable-logging
ac_add_options --enable-optimize="%{rpmcflags} -Os"
%endif
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
+ac_add_options --disable-install-strip
%if %{with tests}
ac_add_options --enable-tests
+ac_add_options --enable-mochitest
%else
ac_add_options --disable-tests
+ac_add_options --disable-mochitest
%endif
-%if %{with gnomeui}
-ac_add_options --enable-gnomeui
-%else
+ac_add_options --disable-cpp-exceptions
+ac_add_options --disable-crashreporter
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-gconf
ac_add_options --disable-gnomeui
-%endif
-%if %{with gnomevfs}
-ac_add_options --enable-gnomevfs
-%else
ac_add_options --disable-gnomevfs
-%endif
-ac_add_options --disable-crashreporter
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
+ac_add_options --disable-long-long-warning
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-pedantic
ac_add_options --disable-updater
-ac_add_options --disable-strip
-ac_add_options --disable-xprint
+ac_add_options --disable-xterm-updates
+ac_add_options --enable-canvas
+ac_add_options --enable-chrome-format=omni
+ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
+ac_add_options --enable-extensions=default
+ac_add_options --enable-gio
+ac_add_options --enable-gstreamer=1.0
+ac_add_options --enable-libxul
+ac_add_options --enable-mathml
+ac_add_options --enable-pango
+ac_add_options --enable-readline
+ac_add_options --enable-safe-browsing
+%{?with_shared_js:ac_add_options --enable-shared-js}
ac_add_options --enable-startup-notification
ac_add_options --enable-svg
ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --enable-libxul
+ac_add_options --enable-url-classifier
ac_add_options --enable-xinerama
+ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --with-distribution-id=org.pld-linux
%if %{with xulrunner}
-ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
%endif
ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
+ac_add_options --with-system-ply
ac_add_options --with-system-png
ac_add_options --with-system-zlib
-ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
+ac_add_options --with-x
EOF
%{__make} -j1 -f client.mk build \
- STRIP="/bin/true" \
CC="%{__cc}" \
- CXX="%{__cxx}"
+ CXX="%{__cxx}" \
+ MOZ_MAKE_FLAGS="%{_smp_mflags}"
%install
rm -rf $RPM_BUILD_ROOT
cd mozilla
install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
- $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
- $RPM_BUILD_ROOT%{_datadir}/%{name}
+ $RPM_BUILD_ROOT%{_desktopdir} \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/browser \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins
-%if %{without xulrunner}
-%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-%endif
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
%{__make} -C obj-%{_target_cpu}/browser/installer stage-package \
DESTDIR=$RPM_BUILD_ROOT \
- MOZ_PKG_APPDIR=%{_libdir}/%{name} \
+ installdir=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
-# move arch independant ones to datadir
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
-%if %{without xulrunner}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
+cp -a obj-%{_target_cpu}/dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
+
+%if %{with xulrunner}
+# >= 5.0 seems to require this
+ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
%endif
-ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
-ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
-ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
-ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
-ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
+
+# move arch independant ones to datadir
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/icons
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/searchplugins
%if %{without xulrunner}
-ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
-ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/{pref,preferences}
+%else
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
%endif
+ln -s ../../../share/%{name}/browser/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome
+ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults
+ln -s ../../../share/%{name}/browser/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions
+ln -s ../../../share/%{name}/browser/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons
+ln -s ../../../share/%{name}/browser/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/searchplugins
+
%if %{without xulrunner}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
%endif
-sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE4} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
-install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
+# install icons and desktop file
+for i in 48 64; do
+ install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps
+ cp -a browser/branding/unofficial/content/icon${i}.png \
+ $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/mozilla-firefox.png
+done
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-# files created by regxpcom and firefox -register
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
+# install our settings
+%if "%{pld_release}" == "ac"
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
+%else
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
+%endif
-# what's this? it's content is invalid anyway.
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/old-homepage-default.properties
+# files created by firefox -register
+touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/compreg.dat
+touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/xpti.dat
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
umask 022
-rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
+rm -f %{_libdir}/%{name}/browser/components/{compreg,xpti}.dat
# it attempts to touch files in $HOME/.mozilla
# beware if you run this with sudo!!!
# also TMPDIR could be pointing to sudo user's homedir
unset TMPDIR TMP || :
-#LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_libdir}/%{name}/regxpcom
%{_libdir}/%{name}/firefox -register
rm -rf $HOME
EOF
+chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
%clean
rm -rf $RPM_BUILD_ROOT
%pretrans
+if [ -d %{_libdir}/%{name}/browser/extensions ] && [ ! -L %{_libdir}/%{name}/browser/extensions ]; then
+ install -d %{_datadir}/%{name}/browser
+ if [ -e %{_datadir}/%{name}/browser/extensions ]; then
+ mv %{_datadir}/%{name}/browser/extensions{,.rpmsave}
+ fi
+ mv -v %{_libdir}/%{name}/browser/extensions %{_datadir}/%{name}/browser/extensions
+fi
if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
fi
-for d in chrome defaults extensions greprefs icons res searchplugins; do
- if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
- install -d %{_datadir}/%{name}
- mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
- fi
-done
exit 0
%post
%{_sbindir}/%{name}-chrome+xpcom-generate
-%if %{without xulrunner}
%update_browser_plugins
-%endif
+%update_icon_cache hicolor
+%update_desktop_database
%postun
-%if %{without xulrunner}
if [ "$1" = 0 ]; then
%update_browser_plugins
+ %update_icon_cache hicolor
fi
-%endif
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/firefox
%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
-%if %{without xulrunner}
+%{_desktopdir}/mozilla-firefox.desktop
+%{_iconsdir}/hicolor/*/apps/mozilla-firefox.png
+
# browser plugins v2
%{_browserpluginsconfdir}/browsers.d/%{name}.*
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
-%endif
%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libjemalloc.so
-%if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
-%attr(755,root,root) %{_libdir}/%{name}/libxul.so
-%endif
-%{_libdir}/%{name}/blocklist.xml
+%dir %{_libdir}/%{name}/browser
+%dir %{_libdir}/%{name}/browser/components
+%dir %{_libdir}/%{name}/browser/plugins
-%if %{with crashreporter}
-%{_libdir}/%{name}/crashreporter
-%{_libdir}/%{name}/crashreporter-override.ini
-%{_libdir}/%{name}/crashreporter.ini
-%{_libdir}/%{name}/Throbber-small.gif
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/browser
+%dir %{_datadir}/%{name}/browser/extensions
+%{_datadir}/%{name}/browser/chrome
+%{_datadir}/%{name}/browser/defaults
+%{_datadir}/%{name}/browser/icons
+%{_datadir}/%{name}/browser/searchplugins
+
+# symlinks
+%{_libdir}/%{name}/browser/extensions
+%{_libdir}/%{name}/browser/chrome
+%{_libdir}/%{name}/browser/icons
+%{_libdir}/%{name}/browser/searchplugins
+%if %{with xulrunner}
+%{_libdir}/%{name}/xulrunner
%endif
+%{_libdir}/%{name}/browser/defaults
-# config?
-%{_libdir}/%{name}/.autoreg
+%attr(755,root,root) %{_libdir}/%{name}/firefox
+%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
+%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%{_libdir}/%{name}/application.ini
+%{_libdir}/%{name}/browser/blocklist.xml
+%{_libdir}/%{name}/browser/chrome.manifest
+%{_libdir}/%{name}/browser/components/components.manifest
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
+# the signature of the default theme
+%{_datadir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/browser/omni.ja
+%{_libdir}/%{name}/webapprt
+%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
-%dir %{_libdir}/%{name}/components
+# files created by firefox -register
+%ghost %{_libdir}/%{name}/browser/components/compreg.dat
+%ghost %{_libdir}/%{name}/browser/components/xpti.dat
-%{_libdir}/%{name}/components/aboutRights.js
-%{_libdir}/%{name}/components/aboutRobots.js
-%{_libdir}/%{name}/components/FeedConverter.js
-%{_libdir}/%{name}/components/FeedWriter.js
-%{_libdir}/%{name}/components/WebContentConverter.js
-%{_libdir}/%{name}/components/browser.xpt
-%{_libdir}/%{name}/components/fuelApplication.js
-%{_libdir}/%{name}/components/nsBrowserContentHandler.js
-%{_libdir}/%{name}/components/nsBrowserGlue.js
-%{_libdir}/%{name}/components/nsMicrosummaryService.js
-%{_libdir}/%{name}/components/nsPlacesTransactionsService.js
-%{_libdir}/%{name}/components/nsSafebrowsingApplication.js
-%{_libdir}/%{name}/components/nsSearchService.js
-%{_libdir}/%{name}/components/nsSearchSuggestions.js
-%{_libdir}/%{name}/components/nsSessionStartup.js
-%{_libdir}/%{name}/components/nsSessionStore.js
-%{_libdir}/%{name}/components/nsSetDefaultBrowser.js
-%{_libdir}/%{name}/components/nsSidebar.js
%if %{without xulrunner}
+# private xulrunner instance
+%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
-%{_libdir}/%{name}/components/FeedProcessor.js
-%{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/nsAddonRepository.js
-%{_libdir}/%{name}/components/nsBadCertHandler.js
-%{_libdir}/%{name}/components/nsBlocklistService.js
-%{_libdir}/%{name}/components/nsContentDispatchChooser.js
-%{_libdir}/%{name}/components/nsContentPrefService.js
-%{_libdir}/%{name}/components/nsDefaultCLH.js
-%{_libdir}/%{name}/components/nsDownloadManagerUI.js
-%{_libdir}/%{name}/components/nsExtensionManager.js
-%{_libdir}/%{name}/components/nsFilePicker.js
-%{_libdir}/%{name}/components/nsHandlerService.js
-%{_libdir}/%{name}/components/nsHelperAppDlg.js
-%{_libdir}/%{name}/components/nsLivemarkService.js
-%{_libdir}/%{name}/components/nsLoginInfo.js
-%{_libdir}/%{name}/components/nsLoginManager.js
-%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
-%{_libdir}/%{name}/components/nsProxyAutoConfig.js
-%{_libdir}/%{name}/components/nsTaggingService.js
-%{_libdir}/%{name}/components/nsTryToClose.js
-%{_libdir}/%{name}/components/nsURLFormatter.js
-%{_libdir}/%{name}/components/nsUpdateService.js
-%{_libdir}/%{name}/components/nsUrlClassifierLib.js
-%{_libdir}/%{name}/components/nsUrlClassifierListManager.js
-%{_libdir}/%{name}/components/nsWebHandlerApp.js
-%{_libdir}/%{name}/components/pluginGlue.js
-%{_libdir}/%{name}/components/storage-Legacy.js
-%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
-%endif
-
-%attr(755,root,root) %{_libdir}/%{name}/components/libbrowsercomps.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libbrowserdirprovider.so
-%if %{without xulrunner}
+%dir %{_libdir}/%{name}/components
+%{_libdir}/%{name}/components/components.manifest
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
-%endif
-
-%if %{with gnomevfs}
-%if %{without xulrunner}
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
-%endif
-%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
-%endif
-
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/firefox
-%if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
-%endif
-%{_pixmapsdir}/mozilla-firefox.png
-%{_desktopdir}/mozilla-firefox.desktop
-
-# symlinks
-%{_libdir}/%{name}/chrome
-%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/extensions
-%{_libdir}/%{name}/icons
-%{_libdir}/%{name}/modules
-%{_libdir}/%{name}/searchplugins
-%if %{without xulrunner}
+%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
+%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
+%attr(755,root,root) %{_libdir}/%{name}/libxul.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin-container
%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/greprefs
-%{_libdir}/%{name}/res
-%endif
-
-# browserconfig
-%{_libdir}/%{name}/browserconfig.properties
+%{_libdir}/%{name}/chrome.manifest
+%{_libdir}/%{name}/omni.ja
-%{_libdir}/%{name}/README.txt
-
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/chrome
-%{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/icons
-%{_datadir}/%{name}/modules
-%{_datadir}/%{name}/searchplugins
-%if %{without xulrunner}
-%{_datadir}/%{name}/greprefs
-%{_datadir}/%{name}/res
+%dir %{_libdir}/%{name}/gmp-clearkey
+%dir %{_libdir}/%{name}/gmp-clearkey/0.1
+%{_libdir}/%{name}/gmp-clearkey/0.1/clearkey.info
+%attr(755,root,root) %{_libdir}/%{name}/gmp-clearkey/0.1/libclearkey.so
%endif
-
-%dir %{_datadir}/%{name}/extensions
-# -dom-inspector subpackage?
-#%{_datadir}/%{name}/extensions/inspector@mozilla.org
-# the signature of the default theme
-%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-
-# files created by regxpcom and firefox -register
-%ghost %{_libdir}/%{name}/components/compreg.dat
-%ghost %{_libdir}/%{name}/components/xpti.dat