X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=28ada85c3213435fd0970c6b341d072e1d41a4aa;hb=34dd92dda52630e040a8620f96a7436b3f75b5d7;hp=b214cdc88b6ff8336f266c553f432f9be35672c6;hpb=dea37e8bb26e658cc6301e1bf4cada0fe0497ab9;p=packages%2Ffirefox.git diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index b214cdc..28ada85 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -1,138 +1,139 @@ -# # 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) # - 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..) # # 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 +Summary: Firefox Community Edition web browser +Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 1.5.0.1 -Release: 4 +Version: 2.0.0.4 +Release: 1 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: 99c14794976b2532addfcd2d836c6bb2 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 -Patch5: %{name}-dumpstack.patch -Patch6: %{name}-pango-typo.patch -# UPDATE or DROP? -#PatchX: %{name}-searchplugins.patch +Patch5: %{name}-fonts.patch +Patch69: %{name}-agent.patch +Patch7: %{name}-myspell.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 +BuildRequires: krb5-devel 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.1 -BuildRequires: nss-devel >= 3.10.2 +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: 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} -Requires: nspr >= 1:4.6.1 -Requires: nss >= 3.10.2 +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 +# firefox/thunderbird/seamonkey provide their own versions +%define _noautoreqdep libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so +%define _noautoprovfiles %{_libdir}/%{name}/components +# we don't want these to satisfy xulrunner-devel +%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so +# and as we don't provide them, don't require either +%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so + +%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 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ą. -%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 +%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 Firefox development package. +%description libs +Firefox Community Edition shared libraries. -%description devel -l pl -Pliki nag³ówkowe przegl±darki Mozilla Firefox. +%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 przegl±darki 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 przegl±darki Mozilla Firefox. +%description lang-en -l pl.UTF-8 +Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition. %prep -%setup -q -n mozilla +%setup -qc +cd mozilla %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p0 -%patch6 -p0 +%patch5 -p1 +%patch7 -p1 +%patch69 -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} @@ -146,212 +147,215 @@ 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-system-myspell 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=%{_libdir}/%{name} ac_cv_visibility_pragma=no EOF %{__make} -j1 -f client.mk build \ - CC="%{__cc} -fno-strict-aliasing" \ + CC="%{__cc}" \ CXX="%{__cxx}" %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) - -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 + $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}/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 +ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox -tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz - -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} - -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/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 +install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png -# pkgconfig files -for f in build/unix/*.pc ; do - sed -e 's/firefox-%{version}/mozilla-firefox/' $f \ - > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f) -done +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop -# already provided by standalone packages -rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc +# 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 -sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \ - $RPM_BUILD_ROOT%{_pkgconfigdir}/*.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 -# includedir/dom CFLAGS -sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \ - $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc +# what's this? it's content is invalid anyway. +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list -cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate +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 +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 || : -MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom -MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register +rm -rf $HOME EOF %clean rm -rf $RPM_BUILD_ROOT +%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}/firefox-chrome+xpcom-generate -%banner %{name} -e <