+# 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
-# - make it more pld-like (bookmarks, default page etc..)
+# - (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 gnome # disable all GNOME components (gnomevfs, gnome, gnomeui)
-#
+%bcond_with tests # enable tests (whatever they check)
+%bcond_without kerberos # disable krb5 support
+%bcond_without xulrunner # system xulrunner
+
+%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.9.6
+%define nss_ver 3.15
+
Summary: Firefox Community Edition web browser
Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
Name: mozilla-firefox
-Version: 2.0.0.3
+Version: 25.0
Release: 1
-License: MPL/LGPL
+License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 24398e3d98673a2a92a01a8f771ca12a
-Source1: %{name}.desktop
-Source2: %{name}.sh
-Patch0: mozilla-install.patch
-Patch1: %{name}-lib_path.patch
-Patch3: %{name}-nopangoxft.patch
-Patch5: %{name}-fonts.patch
-Patch69: %{name}-agent.patch
-# drop as soon as bug is fixed since it's so ugly hack
-# fixing symptoms only
-# https://bugzilla.mozilla.org/show_bug.cgi?id=362462
-Patch6: mozilla-hack-gcc_4_2.patch
-Patch7: %{name}-myspell.patch
-# if ac rebuild is needed...
-#PatchX: %{name}-ac.patch
+Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
+# Source0-md5: 90ac047e83079a9046192c732e195329
+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
+Patch14: %{name}-gyp-slashism.patch
+Patch15: %{name}-Disable-Firefox-Health-Report.patch
URL: http://www.mozilla.org/projects/firefox/
-%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
+BuildRequires: GConf2-devel >= 1.2.1
+BuildRequires: OpenGL-devel
+BuildRequires: alsa-lib-devel
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
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel >= 1.10.2-5
+BuildRequires: dbus-glib-devel >= 0.60
+BuildRequires: gcc-c++ >= 6:4.4
+BuildRequires: glib2-devel >= 1:2.20
+BuildRequires: gtk+2-devel >= 2:2.14
+%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
+BuildRequires: hunspell-devel
BuildRequires: libIDL-devel >= 0.8.0
-%{?with_gnome:BuildRequires: libgnome-devel >= 2.0}
-%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.2.0}
+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: libiw-devel
+# requires libjpeg-turbo implementing at least libjpeg 6b API
BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.2.7
-BuildRequires: libstdc++-devel
-BuildRequires: myspell-devel
-BuildRequires: nspr-devel >= 1:4.6.3
-BuildRequires: nss-devel >= 1:3.11.3-3
-BuildRequires: pango-devel >= 1:1.6.0
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libnotify-devel >= 0.4
+BuildRequires: libpng(APNG)-devel >= 0.10
+BuildRequires: libpng-devel >= 1.5.13
+BuildRequires: libstdc++-devel >= 6:4.4
+BuildRequires: libvpx-devel >= 1.0.0
+BuildRequires: nspr-devel >= 1:%{nspr_ver}
+BuildRequires: nss-devel >= 1:%{nss_ver}
+BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.356
+BuildRequires: pkgconfig(libffi) >= 3.0.9
+BuildRequires: python-modules
+BuildRequires: python-virtualenv
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: sqlite3-devel >= 3.7.17
+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
+%if %{with xulrunner}
+BuildRequires: xulrunner-devel >= 2:%{version}
+%endif
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
Requires(post): mktemp >= 1.5-18
-Requires: %{name}-lang-resources = %{version}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: desktop-file-utils
+Requires: hicolor-icon-theme
+%if %{with xulrunner}
+%requires_eq_to xulrunner xulrunner-devel
+%else
Requires: browser-plugins >= 2.0
-Requires: nspr >= 1:4.6.3
-Requires: nss >= 1:3.11.3
+Requires: cairo >= 1.10.2-5
+Requires: dbus-glib >= 0.60
+Requires: glib2 >= 1:2.20
+Requires: gtk+2 >= 2:2.14
+Requires: libjpeg-turbo
+Requires: libpng >= 1.5.13
+Requires: libpng(APNG) >= 0.10
+Requires: myspell-common
+Requires: nspr >= 1:%{nspr_ver}
+Requires: nss >= 1:%{nss_ver}
+Requires: pango >= 1:1.14.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)
-# mozilla and firefox provide their own versions
-%define _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so
-%define _noautoprovfiles %{_libdir}/%{name}/components
-# we don't want these to satisfy xulrunner-devel
-%define _noautoprov libmozjs.so libxpcom.so libxul.so
-# and as we don't provide them, don't require either
-%define _noautoreq libmozjs.so libxpcom.so libxul.so
+%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
-%define specflags -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
+# 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 libmozalloc.so libmozjs.so libxpcom.so libxul.so
+%endif
%description
Firefox Community Edition is an open-source web browser, designed for
standards compliance, performance and portability.
%description -l pl.UTF-8
-Firefox Community Edition jest open sourcową przeglądarką sieci WWW,
-stworzoną z myślą o zgodności ze standardami, wydajnością i
-przenośnością.
-
-%package libs
-Summary: Firefox Community Edition shared libraries
-Summary(pl.UTF-8): Biblioteki współdzielone przeglądarki Firefox Community Edition
-Group: Libraries
-Conflicts: mozilla-firefox < 2.0-1.4
-
-%description libs
-Firefox Community Edition shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone przeglądarki Firefox Community Edition.
-
-%package lang-en
-Summary: English resources for Firefox Community Edition
-Summary(pl.UTF-8): Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition
-Group: X11/Applications/Networking
-Requires: %{name} = %{version}-%{release}
-Provides: %{name}-lang-resources = %{version}-%{release}
-
-%description lang-en
-English resources for Firefox Community Edition.
-
-%description lang-en -l pl.UTF-8
-Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition.
+Firefox Community Edition jest przeglądarką WWW rozpowszechnianą
+zgodnie z ideami ruchu otwartego oprogramowania oraz tworzoną z myślą
+o zgodności ze standardami, wydajnością i przenośnością.
%prep
%setup -qc
+mv -f mozilla-release mozilla
cd mozilla
+
%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p2
%patch7 -p1
-%patch69 -p1
-
-sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
+%patch9 -p2
+%patch11 -p2
+%patch12 -p2
+%patch13 -p2
+%patch14 -p2
+%patch15 -p1
-# use system
-#rm -rf mozilla/nsprpub mozilla/security/nss
+# config/rules.mk is patched by us and js/src/config/rules.mk
+# is supposed to be exact copy
+cp -a config/rules.mk js/src/config/rules.mk
%build
cd mozilla
-export CFLAGS="%{rpmcflags} $(%{_bindir}/pkg-config mozilla-nspr --cflags-only-I)"
-export CXXFLAGS="%{rpmcflags} $(%{_bindir}/pkg-config mozilla-nspr --cflags-only-I)"
-
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
-cat << 'EOF' > .mozconfig
-. $topsrcdir/browser/config/mozconfig
+cat << EOF > .mozconfig
+. \$topsrcdir/browser/config/mozconfig
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
+# parallel build fails on _xpidlgen/
+%if %{without xulrunner}
+mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags}
+%endif
+mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
# 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 --enable-crash-on-assert
%else
ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
ac_add_options --disable-logging
-ac_add_options --enable-optimize="%{rpmcflags}"
+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
%else
ac_add_options --disable-tests
%endif
-%if %{with gnome}
-ac_add_options --enable-gnomevfs
-ac_add_options --enable-gnomeui
-%else
-ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-gconf
ac_add_options --disable-gnomeui
-%endif
-ac_add_options --disable-freetype2
+ac_add_options --disable-gnomevfs
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
+ac_add_options --disable-long-long-warning
+ac_add_options --disable-pedantic
ac_add_options --disable-updater
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --disable-xterm-updates
+ac_add_options --enable-canvas
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-extensions="default,permissions,gio"
+ac_add_options --enable-gio
+ac_add_options --enable-libxul
+ac_add_options --enable-mathml
+ac_add_options --enable-pango
+ac_add_options --enable-readline
+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-myspell
-ac_add_options --enable-xft
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-url-classifier
+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=$(pkg-config --variable=sdkdir libxul)
+%endif
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+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-zlib
-ac_add_options --with-system-jpeg
+ac_add_options --with-system-ply
ac_add_options --with-system-png
-ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
-ac_cv_visibility_pragma=no
+ac_add_options --with-system-zlib
+ac_add_options --with-x
EOF
-%{__make} -j1 -f client.mk build \
+%{__make} -f client.mk build \
+ STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
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
-%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
-%{__make} -C xpinstall/packager stage-package \
+%{__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
+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
+
# 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}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
-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}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
-ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
-ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d
-ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
-ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
-
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome
+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}
+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/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} -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 %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+# 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
-# header/development files
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link
+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
+# 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
-%pre
+%pretrans
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 init.d 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
%update_browser_plugins
+%update_icon_cache hicolor
+%update_desktop_database
%postun
if [ "$1" = 0 ]; then
%update_browser_plugins
+ %update_icon_cache hicolor
fi
%files
%attr(755,root,root) %{_bindir}/firefox
%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
+%{_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
-%dir %{_libdir}/%{name}/components
-%attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%{_libdir}/%{name}/components/*.js
-%{_libdir}/%{name}/components/*.xpt
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/m*
-%attr(755,root,root) %{_libdir}/%{name}/f*
-%attr(755,root,root) %{_libdir}/%{name}/regxpcom
-%attr(755,root,root) %{_libdir}/%{name}/xpcshell
-%attr(755,root,root) %{_libdir}/%{name}/xpicleanup
-%{_pixmapsdir}/mozilla-firefox.png
-%{_desktopdir}/mozilla-firefox.desktop
-
-# symlinks
-%{_libdir}/%{name}/chrome
-%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/extensions
-%{_libdir}/%{name}/greprefs
-%{_libdir}/%{name}/icons
-%{_libdir}/%{name}/init.d
-%{_libdir}/%{name}/res
-%{_libdir}/%{name}/searchplugins
-
-# browserconfig
-%{_libdir}/%{name}/browserconfig.properties
-
-%{_libdir}/%{name}/LICENSE
-%{_libdir}/%{name}/README.txt
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/browser
+%dir %{_libdir}/%{name}/browser/components
+%dir %{_libdir}/%{name}/browser/extensions
+%dir %{_libdir}/%{name}/browser/plugins
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/chrome
-%{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/greprefs
-%{_datadir}/%{name}/icons
-%{_datadir}/%{name}/init.d
-%{_datadir}/%{name}/res
-%{_datadir}/%{name}/searchplugins
-
-%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
+%dir %{_datadir}/%{name}/browser
+%{_datadir}/%{name}/browser/chrome
+%{_datadir}/%{name}/browser/defaults
+%{_datadir}/%{name}/browser/icons
+%{_datadir}/%{name}/browser/searchplugins
-%files libs
-%defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-
-%files lang-en
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/chrome/en-US.jar
-%{_datadir}/%{name}/chrome/en-US.manifest
+# symlinks
+%{_libdir}/%{name}/browser/chrome
+%{_libdir}/%{name}/browser/icons
+%{_libdir}/%{name}/browser/searchplugins
+%if %{with xulrunner}
+%{_libdir}/%{name}/xulrunner
+%endif
+%{_libdir}/%{name}/browser/defaults
+
+%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
+%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/browser/omni.ja
+%{_libdir}/%{name}/webapprt
+%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
+
+# files created by firefox -register
+%ghost %{_libdir}/%{name}/browser/components/compreg.dat
+%ghost %{_libdir}/%{name}/browser/components/xpti.dat
+
+%if %{without xulrunner}
+# private xulrunner instance
+%{_libdir}/%{name}/dependentlibs.list
+%{_libdir}/%{name}/platform.ini
+%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/libmozgnome.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
+%attr(755,root,root) %{_libdir}/%{name}/libxul.so
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+%attr(755,root,root) %{_libdir}/%{name}/plugin-container
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/chrome.manifest
+%{_libdir}/%{name}/omni.ja
+%endif