X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirefox.git;a=blobdiff_plain;f=mozilla-firefox.spec;h=c1c9f21849143a26bc4d7b07090cfb745608d280;hp=0752cf1fc1e00beeb69ab642f3fc538b164964e6;hb=d541162e3eb4e8d6201048628ab0f7bfa2fdd238;hpb=ec0df5cc06f7a8deef398bc0310e049e5c70b0d3 diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 0752cf1..c1c9f21 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -1,9 +1,10 @@ -# # 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 -# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x. +# 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 gnome # disable all GNOME components (gnomevfs, gnome, gnomeui) @@ -11,54 +12,60 @@ Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przegl±darka WWW Name: mozilla-firefox -Version: 1.5.0.1 -Release: 1 +Version: 2.0.0.1 +Release: 0.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 -# Source0-md5: c76f02956645bc823241379e27f76bb5 +# Source0-md5: 7a1fc804ed735c5b7e9b1498bac8b5db Source1: %{name}.desktop Source2: %{name}.sh -Patch0: %{name}-nss.patch +Patch0: mozilla-install.patch Patch1: %{name}-lib_path.patch -Patch2: %{name}-nss-system-nspr.patch Patch3: %{name}-nopangoxft.patch -Patch4: %{name}-name.patch -# UPDATE or DROP? -#PatchX: %{name}-searchplugins.patch +Patch5: %{name}-fonts.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: 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: libpng-devel >= 1.2.7 BuildRequires: libstdc++-devel -BuildRequires: nspr-devel >= 1:4.6-0.20041030.1 -BuildRequires: nss-devel >= 3.8 +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-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} -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: %{name}-libs = %{epoch}:%{version}-%{release} +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 %{_firefoxdir}/components + +%define specflags -fno-strict-aliasing %description Mozilla Firefox is an open-source web browser, designed for standards @@ -68,13 +75,26 @@ compliance, performance and portability. Mozilla Firefox 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: Mozilla Firefox shared libraries +Summary(pl): Biblioteki wspó³dzielone przegl±darki Mozilla Firefox +Group: Libraries +Conflicts: mozilla-firefox < 2.0-1.4 + +%description libs +Mozilla Firefox shared libraries. + +%description libs -l pl +Biblioteki wspó³dzielone przegl±darki Mozilla Firefox. + %package devel Summary: Headers for developing programs that will use Mozilla Firefox Summary(pl): Mozilla Firefox - pliki nag³ówkowe Group: X11/Development/Libraries +Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: nspr-devel >= 1:4.6.3 +Requires: nss-devel >= 1:3.11.3-3 Obsoletes: mozilla-devel -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: nspr-devel >= 1:4.6-0.20041030.1 %description devel Mozilla Firefox development package. @@ -86,8 +106,6 @@ Pliki nag 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 Requires: %{name} = %{version}-%{release} Provides: %{name}-lang-resources = %{version}-%{release} @@ -98,34 +116,31 @@ English resources for Mozilla Firefox. Anglojêzyczne zasoby dla przegl±darki Mozilla Firefox. %prep -%setup -q -n mozilla +%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 -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`" +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 -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 +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} @@ -139,47 +154,44 @@ ac_add_options --localstatedir=%{_localstatedir} 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}" %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-profilesharing -ac_add_options --disable-xprint -ac_add_options --enable-canvas -ac_add_options --enable-crypto +ac_add_options --disable-javaxpcom +ac_add_options --disable-updater 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 -ac_add_options --enable-svg ac_add_options --enable-system-cairo 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 %{__make} -j1 -f client.mk build \ @@ -188,147 +200,102 @@ EOF %install 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) - -%{__make} -C xpinstall/packager \ - MOZ_PKG_APPNAME="mozilla-firefox" \ - MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \ - EXCLUDE_NSPR_LIBS=1 + $RPM_BUILD_ROOT{%{_includedir},%{_pkgconfigdir}} -install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +%{__make} -C xpinstall/packager stage-package \ + DESTDIR=$RPM_BUILD_ROOT \ + MOZ_PKG_APPDIR=%{_firefoxdir} \ + PKG_SKIP_STRIP=1 -tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz +sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +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 browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png +#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} -#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 - +# header/development files +cp -rfLp dist/include $RPM_BUILD_ROOT%{_includedir}/%{name} +cp -rfLp 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 -# 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 + +# 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 -#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} -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 || : -MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom -MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register +rm -rf $HOME EOF %clean rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig -%{_sbindir}/firefox-chrome+xpcom-generate -%banner %{name} -e <%{_firefoxdir}/chrome/installed-chrome.txt - -#%postun lang-en -#umask 022 -#cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt +%{_sbindir}/%{name}-chrome+xpcom-generate %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/mozilla* -%attr(755,root,root) %{_sbindir}/* -%dir %{_firefoxdir} +%attr(755,root,root) %{_bindir}/%{name} +%attr(755,root,root) %{_bindir}/firefox +%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate + %{_firefoxdir}/res %dir %{_firefoxdir}/components %attr(755,root,root) %{_firefoxdir}/components/*.so %{_firefoxdir}/components/*.js %{_firefoxdir}/components/*.xpt -%{_firefoxdir}/plugins +%dir %{_firefoxdir}/plugins +%attr(755,root,root) %{_firefoxdir}/plugins/*.so %{_firefoxdir}/searchplugins %{_firefoxdir}/icons %{_firefoxdir}/defaults %{_firefoxdir}/greprefs %dir %{_firefoxdir}/extensions +%dir %{_firefoxdir}/dictionaries %dir %{_firefoxdir}/init.d -%attr(755,root,root) %{_firefoxdir}/*.so +%{_firefoxdir}/init.d/README %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}/* @@ -336,15 +303,34 @@ fi %dir %{_firefoxdir}/chrome %{_firefoxdir}/chrome/*.jar %{_firefoxdir}/chrome/*.manifest -# -chat subpackage? -#%{_firefoxdir}/chrome/chatzilla.jar -#%{_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 +# -dom-inspector subpackage? +%dir %{_firefoxdir}/extensions/inspector@mozilla.org +%{_firefoxdir}/extensions/inspector@mozilla.org/* + +# the signature of the default theme +%dir %{_firefoxdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{_firefoxdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf + +# 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 libs +%defattr(644,root,root,755) +%dir %{_firefoxdir} +%attr(755,root,root) %{_firefoxdir}/*.so + %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/regxpcom @@ -358,4 +344,6 @@ fi %defattr(644,root,root,755) %{_firefoxdir}/chrome/en-US.jar %{_firefoxdir}/chrome/en-US.manifest -#%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt +# probably should share these with all mozilla apps +%{_firefoxdir}/dictionaries/en-US.aff +%{_firefoxdir}/dictionaries/en-US.dic