+++ /dev/null
-Index: mozilla/security/coreconf/location.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
-retrieving revision 1.9
-diff -u -r1.9 location.mk
---- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9
-+++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000
-@@ -61,6 +61,8 @@
-
- DIST = $(SOURCE_PREFIX)/$(PLATFORM)
-
-+NSPR_LIBDIR = $(DIST)/lib
-+
- ifdef BUILD_DEBUG_GC
- DEFINES += -DDEBUG_GC
- endif
-Index: mozilla/security/manager/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
-retrieving revision 1.56
-diff -u -r1.56 Makefile.in
---- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56
-+++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000
-@@ -76,12 +76,23 @@
- endif
- endif
-
-+ABS_DIST := $(shell cd $(DIST) && pwd)
-+ifeq ($(OS_ARCH),WINNT)
-+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
-+endif
-+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
-+ifneq (,$(strip $(NSPR_LIBDIR)))
-+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
-+else
-+NSPR_LIBDIR = $(ABS_DIST)/lib
-+endif
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
- DEFAULT_GMAKE_FLAGS += CC="$(CC)"
--DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
--DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
--DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
-+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
-+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
- DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
- DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
- ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
-Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
-retrieving revision 1.14
-diff -u -r1.14 Makefile
---- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14
-+++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000
-@@ -53,23 +53,23 @@
- # This is merely an expedient hack and not the right solution.
- ifdef NS_USE_GCC
- EXTRA_LIBS += \
-- -L$(DIST)/lib \
-+ -L$(NSPR_LIBDIR) \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
- $(NULL)
- else
- EXTRA_LIBS += \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
- $(NULL)
- endif
-
- else
-
- EXTRA_LIBS += \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NULL)
-
- endif
-Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
-retrieving revision 1.18
-diff -u -r1.18 Makefile
---- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18
-+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000
-@@ -63,7 +63,7 @@
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- $(CRYPTO_LIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- -L$(DIST)/lib \
-+ -L$(NSPR_LIBDIR) \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
-@@ -76,8 +76,8 @@
- $(DIST)/lib/softokn.lib \
- $(CRYPTO_LIB) \
- $(DIST)/lib/secutil.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
- wsock32.lib \
- winmm.lib \
- $(NULL)
-@@ -98,8 +98,8 @@
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- $(CRYPTO_LIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NULL)
-
- endif
-#
# TODO:
# - with new gcc version (it is possible that)
# - -fvisibility=hiddenn and ac_cv_visibility_pragma=no can be removed
# 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.
+# for hints how to make locales
+# - check all remaining configure options... done. test them now!
+# - make it more pld-like (bookmarks, default page etc..)
+# - add dictionaries outside of mozilla
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
Summary: Mozilla Firefox web browser
Summary(pl): Mozilla Firefox - przegl±darka WWW
Name: mozilla-firefox
-Version: 1.5.0.7
-Release: 1
+Version: 2.0
+Release: 0.23
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: 518cbd99a3fe663237070013e5cdb1a4
+# Source0-md5: 03709c15cba0e0375ff5336d538f77e7
Source1: %{name}.desktop
Source2: %{name}.sh
-Patch0: %{name}-nss.patch
Patch1: %{name}-lib_path.patch
-Patch2: %{name}-nss-system-nspr.patch
Patch3: %{name}-nopangoxft.patch
Patch4: %{name}-name.patch
Patch5: %{name}-fonts.patch
-# UPDATE or DROP?
-#PatchX: %{name}-searchplugins.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
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libpng-devel >= 1.2.7
BuildRequires: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.6.1-2
-BuildRequires: nss-devel >= 1:3.11.3
+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: xorg-lib-libXt-devel
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
+Requires(post): mktemp >= 1.5-18
Requires: %{name}-lang-resources = %{version}
-Requires: nspr >= 1:4.6.1-2
+Requires: nspr >= 1:4.6.3
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 %{_firefoxdir}/components
%define specflags -fno-strict-aliasing
Summary(pl): Mozilla Firefox - pliki nag³ówkowe
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: nspr-devel >= 1:4.6.1-2
+Requires: nspr-devel >= 1:4.6.3
+Requires: nss-devel >= 1:3.11.3-3
Obsoletes: mozilla-devel
%description devel
%prep
%setup -qc
cd mozilla
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
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
-
+# 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 --sharedstatedir=%{_sharedstatedir}
ac_add_options --mandir=%{_mandir}
ac_add_options --infodir=%{_infodir}
-ac_add_options --enable-optimize="%{rpmcflags}"
%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}"
+ac_add_options --enable-elf-dynstr-gc
+ac_add_options --enable-cpp-exceptions
+ac_add_options --enable-cpp-rtti
%endif
%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-gnomeui
+%endif
ac_add_options --disable-composer
ac_add_options --disable-dtd-debug
ac_add_options --disable-freetype2
ac_add_options --disable-jsd
ac_add_options --disable-ldap
ac_add_options --disable-mailnews
-ac_add_options --disable-profilesharing
-ac_add_options --disable-xprint
ac_add_options --enable-canvas
+ac_add_options --enable-cookies
ac_add_options --enable-crypto
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --enable-mathml
ac_add_options --enable-pango
-ac_add_options --enable-reorder
-ac_add_options --enable-single-profile
-ac_add_options --enable-strip
-ac_add_options --enable-strip-libs
+# This breaks mozilla start - don't know why
+#ac_add_options --enable-places
+ac_add_options --enable-postscript
+ac_add_options --enable-safe-browsing
ac_add_options --enable-svg
ac_add_options --enable-system-cairo
+ac_add_options --enable-update-channel=default
+ac_add_options --enable-url-classifier
ac_add_options --enable-xft
ac_add_options --enable-xinerama
ac_add_options --enable-xpctools
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg
+ac_add_options --with-distribution-id=org.pld-linux
ac_add_options --with-system-nspr
-ac_add_options --with-system-png
+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-default-mozilla-five-home=%{_firefoxdir}
ac_cv_visibility_pragma=no
EOF
+%if 0
+# sanity checks
+# TODO: should hook somewhere between configure and real make
+if [ $(grep -c "MOZ_NATIVE_NSPR = 1" config/autoconf.mk) != 1 ]; then
+ : internal nspr used!
+ exit 1
+fi
+if [ $(grep -c "MOZ_NATIVE_NSS = 1" config/autoconf.mk) != 1 ]; then
+ : internal nss used!
+ exit 1
+fi
+if [ $(grep -c "MOZ_NATIVE_ZLIB = 1" config/autoconf.mk) != 1 ]; then
+ : internal zlib used!
+ exit 1
+fi
+if [ $(grep -c "MOZ_NATIVE_JPEG = 1" config/autoconf.mk) != 1 ]; then
+ : internal libjpeg used!
+ exit 1
+fi
+if [ $(grep -c "MOZ_NATIVE_PNG = 1" config/autoconf.mk) != 1 ]; then
+ : internal libpng used!
+ exit 1
+fi
+%endif
+
%{__make} -j1 -f client.mk build \
CC="%{__cc}" \
CXX="%{__cxx}"
rm -rf $RPM_BUILD_ROOT
cd mozilla
install -d \
- $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
+ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
- $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
-# extensions dir is needed (it can be empty)
+ $RPM_BUILD_ROOT{%{_includedir},%{_pkgconfigdir}}
-ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
-
-%{__make} -C xpinstall/packager \
- MOZ_PKG_APPNAME="mozilla-firefox" \
- MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \
- EXCLUDE_NSPR_LIBS=1
+%{__make} -C xpinstall/packager stage-package \
+ MOZ_PKG_APPNAME=%{name} \
+ SIGN_NSS= \
+ PKG_SKIP_STRIP=1
+cp -a dist/%{name} $RPM_BUILD_ROOT%{_libdir}
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
+ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
install other-licenses/branding/firefox/content/icon64.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/
+#install -m644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/
+#install -m644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/US/
install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-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
-
+cp -rfL dist/include $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -rfL dist/idl $RPM_BUILD_ROOT%{_includedir}/%{name}
+ln -sf necko/nsIURI.h $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
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
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/xpidl
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/xpt_dump
+mv $RPM_BUILD_ROOT{%{_firefoxdir},%{_bindir}}/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)
+for f in build/unix/*.pc; do
+ sed -e 's/firefox-%{version}/mozilla-firefox/' $f > $RPM_BUILD_ROOT%{_pkgconfigdir}/${f##*/}
done
# already provided by standalone packages
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
+rm $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
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
+# files created by regxpcom and firefox -register
+touch $RPM_BUILD_ROOT%{_firefoxdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{_firefoxdir}/components/xpti.dat
+
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
umask 022
-rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
-MOZILLA_FIVE_HOME=%{_firefoxdir}
-export MOZILLA_FIVE_HOME
-# 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=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_firefoxdir}/regxpcom
+%{_firefoxdir}/firefox -register
-unset TMPDIR TMP || :
-export HOME=$(mktemp -d)
-MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom
-MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register
rm -rf $HOME
EOF
rm -rf $RPM_BUILD_ROOT
%post
-%{_sbindir}/firefox-chrome+xpcom-generate
-
-%postun
-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
+%{_sbindir}/%{name}-chrome+xpcom-generate
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla*
+%attr(755,root,root) %{_bindir}/%{name}
%attr(755,root,root) %{_bindir}/firefox
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
%dir %{_firefoxdir}
%{_firefoxdir}/res
%dir %{_firefoxdir}/components
%{_firefoxdir}/defaults
%{_firefoxdir}/greprefs
%dir %{_firefoxdir}/extensions
+%dir %{_firefoxdir}/dictionaries
%dir %{_firefoxdir}/init.d
+%{_firefoxdir}/init.d/README
%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}/regxpcom
%attr(755,root,root) %{_firefoxdir}/x*
%{_pixmapsdir}/*
-%{_desktopdir}/*.desktop
+%{_desktopdir}/*
%dir %{_firefoxdir}/chrome
%{_firefoxdir}/chrome/*.jar
%{_firefoxdir}/chrome/*.manifest
-# -chat subpackage?
-#%{_firefoxdir}/chrome/chatzilla.jar
-#%{_firefoxdir}/chrome/content-packs.jar
%dir %{_firefoxdir}/chrome/icons
%{_firefoxdir}/chrome/icons/default
%dir %{_firefoxdir}/extensions/inspector@mozilla.org
%{_firefoxdir}/extensions/inspector@mozilla.org/*
+# updater
+%{_firefoxdir}/updater
+%{_firefoxdir}/updater.ini
+
+# browserconfig
+%{_firefoxdir}/browserconfig.properties
+
+%{_firefoxdir}/LICENSE
+%{_firefoxdir}/README.txt
+%{_firefoxdir}/chrome/chromelist.txt
+%{_firefoxdir}/dependentlibs.list
+
+# files created by regxpcom and firefox -register
+%ghost %{_firefoxdir}/components/compreg.dat
+%ghost %{_firefoxdir}/components/xpti.dat
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/regxpcom
%defattr(644,root,root,755)
%{_firefoxdir}/chrome/en-US.jar
%{_firefoxdir}/chrome/en-US.manifest
+# probably should share these with all mozilla apps
+%{_firefoxdir}/dictionaries/en-US.aff
+%{_firefoxdir}/dictionaries/en-US.dic