-#
# 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 and other stuff like extensions working
-# - unpackaged files check
-# /usr/lib/mozilla-firefox/LICENSE
-# /usr/lib/mozilla-firefox/README.txt
-# /usr/lib/mozilla-firefox/browserconfig.properties
-# /usr/lib/mozilla-firefox/chrome/chatzilla.jar
-# /usr/lib/mozilla-firefox/chrome/chromelist.txt
-# /usr/lib/mozilla-firefox/chrome/content-packs.jar
-# /usr/lib/mozilla-firefox/chrome/embed-sample.jar
-# /usr/lib/mozilla-firefox/chrome/installed-chrome.txt
-# /usr/lib/mozilla-firefox/components/myspell/en-US.aff
-# /usr/lib/mozilla-firefox/components/myspell/en-US.dic
-# /usr/lib/mozilla-firefox/init.d/README
+# for hints how to make locales
+# - make it more pld-like (bookmarks, default page etc..)
+# - add dictionaries outside of mozilla
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
-%bcond_without ft218 # compile with freetype < 2.1.8
+%bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui)
#
-Summary: Mozilla Firefox web browser
-Summary(pl): Mozilla Firefox - przegl±darka WWW
+Summary: Firefox Community Edition web browser
+Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
Name: mozilla-firefox
-Version: 1.0.7
-Release: 1
+Version: 2.0.0.2
+Release: 3
License: MPL/LGPL
Group: X11/Applications/Networking
-Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 5704a8c36de84b408e069afb0c5bc1df
+Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
+# Source0-md5: d7db87b76c1e78a229b662d7dd642265
Source1: %{name}.desktop
Source2: %{name}.sh
-Patch0: %{name}-alpha-gcc3.patch
-Patch1: %{name}-gfx.patch
-Patch2: %{name}-nss.patch
-Patch3: %{name}-lib_path.patch
-Patch4: %{name}-freetype.patch
-Patch5: %{name}-searchplugins.patch
-Patch6: %{name}-gcc-bugs.patch
+Patch0: mozilla-install.patch
+Patch1: %{name}-lib_path.patch
+Patch3: %{name}-nopangoxft.patch
+Patch5: %{name}-fonts.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
+# if ac rebuild is needed...
+#PatchX: %{name}-ac.patch
URL: http://www.mozilla.org/projects/firefox/
+%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: automake
-%if %{with ft218}
-BuildRequires: freetype-devel >= 1:2.1.9
-%else
-BuildRequires: freetype-devel >= 2.1.3
-BuildRequires: freetype-devel < 1:2.1.8
-BuildConflicts: freetype-devel = 2.1.8
-%endif
-BuildRequires: gnome-vfs2-devel
-BuildRequires: libgnome-devel >= 2.0
-BuildRequires: GConf2-devel
+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
+BuildRequires: heimdal-devel >= 0.7.1
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-0.20041030.1
-BuildRequires: nss-devel >= 3.8
-BuildRequires: pango-devel >= 1:1.1.0
-BuildRequires: perl-modules
+BuildRequires: nspr-devel >= 1:4.6.3
+BuildRequires: nss-devel >= 1:3.11.3-3
+BuildRequires: pango-devel >= 1:1.6.0
+BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.356
+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(post): mktemp >= 1.5-18
Requires: %{name}-lang-resources = %{version}
-%if %{with ft218}
-Requires: freetype >= 1:2.1.3
-%else
-Requires: freetype >= 2.1.3
-Conflicts: freetype = 2.1.8
-%endif
-Requires: nspr >= 1:4.6-0.20041030.1
-Requires: nss >= 3.8
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: browser-plugins >= 2.0
+Requires: nspr >= 1:4.6.3
+Requires: nss >= 1:3.11.3
+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 _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so
+%define _noautoprovfiles %{_libdir}/%{name}/components
+
+%define specflags -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
%description
-Mozilla Firefox is an open-source web browser, designed for standards
-compliance, performance and portability.
+Firefox Community Edition is an open-source web browser, designed for
+standards compliance, performance and portability.
-%description -l pl
-Mozilla Firefox jest open sourcow± przegl±dark± sieci WWW, stworzon± z
-my¶l± o zgodno¶ci ze standardami, wydajno¶ci± i przeno¶no¶ci±.
+%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 devel
-Summary: Headers for developing programs that will use Mozilla Firefox
-Summary(pl): Mozilla Firefox - pliki nag³ówkowe i biblioteki
-Group: X11/Development/Libraries
-Obsoletes: mozilla-devel
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.6-0.20041030.1
+%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 devel
-Mozilla development package.
+%description libs
+Firefox Community Edition shared libraries.
-%description devel -l pl
-Biblioteki i pliki nag³ówkowe.
+%description libs -l pl.UTF-8
+Biblioteki współdzielone przeglądarki Firefox Community Edition.
%package lang-en
-Summary: English resources for Mozilla-firefox
-Summary(pl): Anglojêzyczne zasoby dla Mozilla-FireFox
+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(post,postun): %{name} = %{version}-%{release}
-Requires(post,postun): textutils
Requires: %{name} = %{version}-%{release}
Provides: %{name}-lang-resources = %{version}-%{release}
%description lang-en
-English resources for Mozilla-firefox
+English resources for Firefox Community Edition.
-%description lang-en -l pl
-Anglojêzyczne zasoby dla Mozilla-FireFox
+%description lang-en -l pl.UTF-8
+Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition.
%prep
-%setup -q -c
+%setup -qc
cd mozilla
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
-%{?with_ft218:%patch4 -p1}
-%patch5 -p0
-%patch6 -p0
+%patch5 -p1
+%patch6 -p2
+
sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
+# use system
+#rm -rf mozilla/nsprpub mozilla/security/nss
+
%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`"
+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
-LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
-
-cat << EOF > .mozconfig
-. \$topsrcdir/browser/config/mozconfig
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-optimize="%{rpmcflags}"
+cat << 'EOF' > .mozconfig
+. $topsrcdir/browser/config/mozconfig
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=%{_prefix}
+ac_add_options --exec-prefix=%{_exec_prefix}
+ac_add_options --bindir=%{_bindir}
+ac_add_options --sbindir=%{_sbindir}
+ac_add_options --sysconfdir=%{_sysconfdir}
+ac_add_options --datadir=%{_datadir}
+ac_add_options --includedir=%{_includedir}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --libexecdir=%{_libexecdir}
+ac_add_options --localstatedir=%{_localstatedir}
+ac_add_options --sharedstatedir=%{_sharedstatedir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --infodir=%{_infodir}
%if %{?debug:1}0
+ac_add_options --disable-optimize
ac_add_options --enable-debug
ac_add_options --enable-debug-modules
+ac_add_options --enable-debugger-info-modules
+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}"
%endif
%if %{with tests}
ac_add_options --enable-tests
%else
ac_add_options --disable-tests
%endif
-ac_add_options --disable-composer
-ac_add_options --disable-dtd-debug
+%if %{with gnome}
+ac_add_options --enable-gnomevfs
+ac_add_options --enable-gnomeui
+%else
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+%endif
+ac_add_options --disable-freetype2
ac_add_options --disable-installer
-ac_add_options --disable-jsd
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-xprint
-ac_add_options --disable-profilesharing
-ac_add_options --enable-xpctools
-ac_add_options --enable-native-uconv
-ac_add_options --enable-crypto
-ac_add_options --enable-freetype2
-ac_add_options --enable-mathml
-ac_add_options --enable-reorder
-ac_add_options --enable-strip
-ac_add_options --enable-strip-libs
-ac_add_options --enable-xinerama
-ac_add_options --enable-xft
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-updater
ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --with-pthreads
+ac_add_options --enable-svg
+ac_add_options --enable-system-cairo
+ac_add_options --enable-xft
+ac_add_options --with-distribution-id=org.pld-linux
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-png
-ac_add_options --with-system-zlib
-ac_add_options --enable-single-profile
+ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
+ac_cv_visibility_pragma=no
EOF
%{__make} -j1 -f client.mk build \
install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
- $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
-
-%{__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
-
-tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*-linux-gnu.tar.gz
-
-install other-licenses/branding/firefox/content/icon32.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
-#install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/
-#install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/US/
+ $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+
+%{__make} -C xpinstall/packager stage-package \
+ DESTDIR=$RPM_BUILD_ROOT \
+ MOZ_PKG_APPDIR=%{_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}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries
+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}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+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
+
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $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}
-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
-
-# header/developement files
-cp -rfL dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -rfL dist/idl/* $RPM_BUILD_ROOT%{_includedir}/%{name}/idl
-
-install dist/bin/regchrome $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
-install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir}
-
-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
+# 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
-# pkgconfig files
-for f in build/unix/*.pc ; do
- sed -e 's/firefox-%{version}/mozilla-firefox/' $f \
- > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
-done
-
-# already provided by standalone packages
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
+# 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
-sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
- $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+# what's this? it's content is invalid anyway.
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-# 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
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
umask 022
-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}
-export MOZILLA_FIVE_HOME
+rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
-# PATH
-PATH=%{_firefoxdir}:$PATH
-export PATH
+# it attempts to touch files in $HOME/.mozilla
+# beware if you run this with sudo!!!
+export HOME=$(mktemp -d)
+# also TMPDIR could be pointing to sudo user's homedir
+unset TMPDIR TMP || :
-# added /usr/lib : don't load your local library
-LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_libdir}/%{name}/regxpcom
+%{_libdir}/%{name}/firefox -register
-unset TMPDIR TMP || :
-%{_firefoxdir}/regxpcom
-%{_firefoxdir}/regchrome
-%{_firefoxdir}/firefox -register
+rm -rf $HOME
EOF
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+for d in chrome defaults dictionaries 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}/firefox-chrome+xpcom-generate
+%{_sbindir}/%{name}-chrome+xpcom-generate
+%update_browser_plugins
%postun
-if [ "$1" != "0" ]; then
- %{_sbindir}/firefox-chrome+xpcom-generate
-fi
-
-%preun
-if [ "$1" == "0" ]; then
- rm -rf %{_firefoxdir}/chrome/overlayinfo
- rm -f %{_firefoxdir}/chrome/*.rdf
- rm -rf %{_firefoxdir}/components
- rm -rf %{_firefoxdir}/extensions
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
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*
-%attr(755,root,root) %{_sbindir}/*
-%dir %{_firefoxdir}
-%{_firefoxdir}/res
-%dir %{_firefoxdir}/components
-%attr(755,root,root) %{_firefoxdir}/components/*.so
-%{_firefoxdir}/components/*.js
-%{_firefoxdir}/components/*.xpt
-%{_firefoxdir}/plugins
-%{_firefoxdir}/searchplugins
-%{_firefoxdir}/icons
-%{_firefoxdir}/defaults
-%{_firefoxdir}/greprefs
-%dir %{_firefoxdir}/init.d
-%attr(755,root,root) %{_firefoxdir}/*.so
-%attr(755,root,root) %{_firefoxdir}/*.sh
-%attr(755,root,root) %{_firefoxdir}/m*
-%attr(755,root,root) %{_firefoxdir}/f*
-%attr(755,root,root) %{_firefoxdir}/reg*
-%attr(755,root,root) %{_firefoxdir}/x*
-%attr(755,root,root) %{_firefoxdir}/T*
-%ifarch %{ix86}
-%attr(755,root,root) %{_firefoxdir}/elf-dynstr-gc
-%endif
-%{_firefoxdir}/bloaturls.txt
-%{_pixmapsdir}/*
-%{_desktopdir}/*
-
-%dir %{_firefoxdir}/chrome
-%{_firefoxdir}/chrome/browser.jar
-# -chat subpackage?
-#%{_firefoxdir}/chrome/chatzilla.jar
-%{_firefoxdir}/chrome/classic.jar
-%{_firefoxdir}/chrome/comm.jar
-#%{_firefoxdir}/chrome/content-packs.jar
-%{_firefoxdir}/chrome/help.jar
+%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/firefox
+%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
+
+# 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 %{_datadir}/%{name}
+%{_datadir}/%{name}/chrome
+%{_datadir}/%{name}/defaults
+%{_datadir}/%{name}/dictionaries
+%{_datadir}/%{name}/greprefs
+%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/init.d
+%{_datadir}/%{name}/res
+%{_datadir}/%{name}/searchplugins
+
+%dir %{_datadir}/%{name}/extensions
# -dom-inspector subpackage?
-%{_firefoxdir}/chrome/inspector.jar
-%{_firefoxdir}/chrome/modern.jar
-%{_firefoxdir}/chrome/pip*.jar
-%{_firefoxdir}/chrome/toolkit.jar
-%{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
-%dir %{_firefoxdir}/chrome/icons
-%{_firefoxdir}/chrome/icons/default
-
-%files devel
+%{_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
+
+%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/regchrome
-%attr(755,root,root) %{_bindir}/regxpcom
-%attr(755,root,root) %{_bindir}/xpidl
-%attr(755,root,root) %{_bindir}/xpt_dump
-%attr(755,root,root) %{_bindir}/xpt_link
-%{_includedir}/%{name}
-%{_pkgconfigdir}/*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
%files lang-en
%defattr(644,root,root,755)
-%{_firefoxdir}/chrome/en-US.jar
-%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt
+%{_datadir}/%{name}/chrome/en-US.jar
+%{_datadir}/%{name}/chrome/en-US.manifest
+# probably should share these with all mozilla apps
+%{_datadir}/%{name}/dictionaries/en-US.aff
+%{_datadir}/%{name}/dictionaries/en-US.dic