X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirefox.git;a=blobdiff_plain;f=mozilla-firefox.spec;h=33baa97f6b321db981b2d3124b61e1c02ea76de3;hp=fa60c93fbd5253d3efdcb9e015bd325fda0cbf8a;hb=97039a131cdef1cd514ca42570520e2298a79830;hpb=3eeab518ec9e549681a43d6e9fd3f5c97da759b5 diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index fa60c93..33baa97 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -1,71 +1,106 @@ # # TODO: +# - with new gcc version (it is possible that) +# - -fvisibility=hiddenn and ac_cv_visibility_pragma=no can be removed +# - with new firefox version (it is possible that) +# - -fno-strict-aliasing can be removed (needs to be tested carefuly, +# not to be fixed soon, imho) # - handle locales differently (runtime, since it's possible to do) -# - move most of %%post to external script as it's done in debian # - 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. # # Conditional build: %bcond_with tests # enable tests (whatever they check) +%bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui) # Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przegl±darka WWW Name: mozilla-firefox -Version: 0.9.2 -Release: 1.2 +Version: 1.5.0.1 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking -Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2 -# Source0-md5: eb6edaa488fb596b08d4ba50072546e1 +Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 +# Source0-md5: c76f02956645bc823241379e27f76bb5 Source1: %{name}.desktop -Patch0: %{name}-alpha-gcc3.patch -Patch1: %{name}-nspr.patch -Patch2: %{name}-nss.patch -Patch3: %{name}-lib_path.patch +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}-dumpstack.patch +Patch6: %{name}-pango-typo.patch +# UPDATE or DROP? +#PatchX: %{name}-searchplugins.patch URL: http://www.mozilla.org/projects/firefox/ +%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: automake -BuildRequires: gtk+2-devel >= 2.0.0 +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: 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: libstdc++-devel -BuildRequires: nspr-devel >= 1:4.5.0 -BuildRequires: nss-devel >= 3.8 -BuildRequires: pango-devel >= 1.1.0 +BuildRequires: nspr-devel >= 1:4.6.1 +BuildRequires: nss-devel >= 3.10.2 +BuildRequires: pango-devel >= 1:1.6.0 +BuildRequires: perl-modules >= 5.004 +BuildRequires: pkgconfig BuildRequires: zip Requires: %{name}-lang-resources = %{version} -Requires: nspr >= 1:4.5.0 -Requires: nss >= 3.8 -PreReq: XFree86-Xvfb +Requires: nspr >= 1:4.6.1 +Requires: nss >= 3.10.2 +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 _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so +%define _noautoprovfiles libplc4.so libplds4.so %description Mozilla Firefox 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 standartami, wydajno¶ci± i przeno¶no¶ci±. +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 devel +Summary: Headers for developing programs that will use Mozilla Firefox +Summary(pl): Mozilla Firefox - pliki nag³ówkowe +Group: X11/Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: nspr-devel >= 1:4.6.1 +Obsoletes: mozilla-devel + +%description devel +Mozilla Firefox development package. + +%description devel -l pl +Pliki nag³ówkowe przegl±darki Mozilla Firefox. %package lang-en -Summary: English resources for Mozilla-firefox -Summary(pl): Anglojêzyczne zasoby dla Mozilla-FireFox -Group: X11/Applications/Networking +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} %description lang-en -English resources for Mozilla-firefox +English resources for Mozilla Firefox. %description lang-en -l pl -Anglojêzyczne zasoby dla Mozilla-FireFox +Anglojêzyczne zasoby dla przegl±darki Mozilla Firefox. %prep %setup -q -n mozilla @@ -73,88 +108,153 @@ Angloj %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p0 +%patch6 -p0 + +sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure %build -export CFLAGS="%{rpmcflags}" -export CXXFLAGS="%{rpmcflags}" -export MOZ_PHOENIX="1" - -cp -f /usr/share/automake/config.* build/autoconf -cp -f /usr/share/automake/config.* nsprpub/build/autoconf -cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf -%configure2_13 \ +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`" + +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 --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} +ac_add_options --enable-optimize="%{rpmcflags}" %if %{?debug:1}0 - --enable-debug \ - --enable-debug-modules \ +ac_add_options --enable-debug +ac_add_options --enable-debug-modules %else - --disable-debug \ - --disable-debug-modules \ +ac_add_options --disable-debug +ac_add_options --disable-debug-modules %endif - --disable-composer \ - --disable-dtd-debug \ - --disable-installer \ - --disable-jsd \ - --disable-ldap \ - --disable-mailnews \ %if %{with tests} - --enable-tests \ +ac_add_options --enable-tests %else - --disable-tests \ +ac_add_options --disable-tests %endif - --disable-xprint \ - --enable-crypto \ - --enable-freetype2 \ - --enable-mathml \ - --enable-optimize="%{rpmcflags}" \ - --enable-plaintext-editor-only \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs \ - --enable-xinerama \ - --enable-xft \ - --enable-default-toolkit="gtk2" \ - --with-pthreads \ - --with-system-jpeg \ - --with-system-nspr \ - --with-system-png \ - --with-system-zlib - -%{__make} +ac_add_options --disable-composer +ac_add_options --disable-dtd-debug +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 --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-system-nspr +ac_add_options --with-system-png +ac_add_options --with-system-zlib +EOF + +%{__make} -j1 -f client.mk build \ + CC="%{__cc} -fno-strict-aliasing" \ + CXX="%{__cxx}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} +install -d \ + $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \ + $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 -#install -m0755 %{name}.sh $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -ln -sf %{_firefoxdir}/firefox $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*-linux-gnu.tar.gz +tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz -install browser/base/skin/Throbber.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png +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 %{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 toolkit +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 -%clean -rm -rf $RPM_BUILD_ROOT +# header/developement files +cp -rfL dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{name} +cp -rfL dist/idl/* $RPM_BUILD_ROOT%{_includedir}/%{name}/idl -%post -umask 022 -cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt +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 + +# pkgconfig files +for f in build/unix/*.pc ; do + sed -e 's/firefox-%{version}/mozilla-firefox/' $f \ + > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f) +done -unset MOZILLA_FIVE_HOME || : +# already provided by standalone packages +rm -f $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 +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 +#!/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 @@ -166,110 +266,86 @@ export PATH LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH -/sbin/ldconfig || : - -%{_firefoxdir}/regxpcom >/dev/null || echo "E: regxpcom was exited: $?" >&2 -%{_firefoxdir}/regchrome >/dev/null || echo "E: regchrome was exited: $?" >&2 - -TDIR=`mktemp -d /tmp/mozilla-firefox-pkg.XXXXXX` || exit 1 -HOME="$TDIR" -export TDIR HOME - -mkdir -p $TDIR/.mozilla/firefox/default -cp -rf %{_firefoxdir}/defaults/profile/* $TDIR/.mozilla/firefox/default - -# preseed profiles.ini -cat > $TDIR/.mozilla/firefox/profiles.ini </dev/null 2>&1 & \ - xvfb_pid=${!}; \ - DISPLAY=:69 %{_bindir}/mozilla-firefox -list-global-items >/dev/null 2>&1 & \ - sleep 15; \ - kill ${xvfb_pid} >/dev/null 2>&1 \ -) - -rm -rf $TDIR +%post +%{_sbindir}/firefox-chrome+xpcom-generate +%banner %{name} -e <%{_firefoxdir}/chrome/installed-chrome.txt + %{_sbindir}/firefox-chrome+xpcom-generate fi %preun if [ "$1" == "0" ]; then - rm -rf %{_firefoxdir}/chrome/overlayinfo - rm -rf %{_firefoxdir}/components - rm -f %{_firefoxdir}/chrome/*.rdf - rm -rf %{_firefoxdir}/extensions + rm -rf %{_firefoxdir}/chrome/overlayinfo + rm -f %{_firefoxdir}/chrome/*.rdf + rm -rf %{_firefoxdir}/components + rm -rf %{_firefoxdir}/extensions 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}/* +%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}/components/myspell %{_firefoxdir}/plugins %{_firefoxdir}/searchplugins %{_firefoxdir}/icons %{_firefoxdir}/defaults -%{_firefoxdir}/ipc +%{_firefoxdir}/greprefs +%dir %{_firefoxdir}/extensions +%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 +%{_firefoxdir}/chrome/*.jar +%{_firefoxdir}/chrome/*.manifest # -chat subpackage? #%{_firefoxdir}/chrome/chatzilla.jar -%{_firefoxdir}/chrome/classic.jar -%{_firefoxdir}/chrome/comm.jar -%{_firefoxdir}/chrome/content-packs.jar -%{_firefoxdir}/chrome/help.jar +#%{_firefoxdir}/chrome/content-packs.jar # -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 +%defattr(644,root,root,755) +%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}/* %files lang-en %defattr(644,root,root,755) %{_firefoxdir}/chrome/en-US.jar -%{_firefoxdir}/chrome/en-unix.jar -%{_firefoxdir}/chrome/US.jar -%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt +%{_firefoxdir}/chrome/en-US.manifest