From: cvs2git Date: Fri, 17 Nov 2006 02:14:54 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create tag 'auto-th-mozilla- X-Git-Tag: auto/th/mozilla-firefox-2_0-0_23 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=e5ec9e8dfd4aa2bf78f1db9a53f1ce067e76bf86;p=packages%2Ffirefox.git This commit was manufactured by cvs2git to create tag 'auto-th-mozilla- firefox-2_0-0_23'. Sprout from master 2006-11-12 14:49:22 UTC Elan Ruusamäe '- wtf, 0 = 0??' Cherrypick from DEVEL 2006-10-01 22:00:22 UTC czarny '- further change names': mozilla-firefox-name.patch -> 1.1.2.3 Cherrypick from unlabeled-1.95.2 2006-11-17 02:14:54 UTC Patryk Zawadzki '- rel up, drop BR: jdk': mozilla-firefox.spec -> 1.95.2.50 Delete: mozilla-firefox-nss-system-nspr.patch mozilla-firefox-nss.patch --- diff --git a/mozilla-firefox-name.patch b/mozilla-firefox-name.patch index 7ba741a..0ff0aed 100644 --- a/mozilla-firefox-name.patch +++ b/mozilla-firefox-name.patch @@ -1,20 +1,42 @@ -diff -ur mozilla/browser/locales/en-US/chrome/branding/brand.dtd mozilla.new/browser/locales/en-US/chrome/branding/brand.dtd ---- mozilla/browser/locales/en-US/chrome/branding/brand.dtd 2005-09-06 04:54:21.000000000 +0000 -+++ mozilla.new/browser/locales/en-US/chrome/branding/brand.dtd 2006-01-15 18:53:10.231714500 +0000 -@@ -1,5 +1,5 @@ -- -- +diff -urN mozilla/browser/locales/en-US/chrome/branding/brand.dtd mozilla.new/browser/locales/en-US/chrome/branding/brand.dtd +--- mozilla/browser/locales/en-US/chrome/branding/brand.dtd 2006-08-25 02:02:37.000000000 +0200 ++++ mozilla.new/browser/locales/en-US/chrome/branding/brand.dtd 2006-10-01 23:32:03.979653250 +0200 +@@ -1,3 +1,3 @@ +- +- + + - - -diff -ur mozilla/browser/locales/en-US/chrome/branding/brand.properties mozilla.new/browser/locales/en-US/chrome/branding/brand.properties ---- mozilla/browser/locales/en-US/chrome/branding/brand.properties 2005-09-06 04:54:21.000000000 +0000 -+++ mozilla.new/browser/locales/en-US/chrome/branding/brand.properties 2006-01-15 18:53:14.511982000 +0000 +diff -urN mozilla/browser/locales/en-US/chrome/branding/brand.properties mozilla.new/browser/locales/en-US/chrome/branding/brand.properties +--- mozilla/browser/locales/en-US/chrome/branding/brand.properties 2006-03-17 05:17:56.000000000 +0100 ++++ mozilla.new/browser/locales/en-US/chrome/branding/brand.properties 2006-10-01 23:32:18.416555500 +0200 @@ -1,3 +1,3 @@ --brandShortName=Deer Park --brandFullName=Deer Park +-brandShortName=Bon Echo +-brandFullName=Bon Echo +brandShortName=Mozilla Firefox +brandFullName=Mozilla Firefox vendorShortName=Mozilla +diff -urN mozilla/configure mozilla.new/configure +--- mozilla/configure 2006-09-15 15:21:10.000000000 +0200 ++++ mozilla.new/configure 2006-10-01 23:31:08.648195250 +0200 +@@ -12916,7 +12916,7 @@ + + browser) + MOZ_APP_NAME=firefox +- MOZ_APP_DISPLAYNAME=BonEcho ++ MOZ_APP_DISPLAYNAME=MozillaFirefox + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_SAFE_BROWSING=1 +diff -urN mozilla/configure.in mozilla.new/configure.in +--- mozilla/configure.in 2006-09-15 15:13:01.000000000 +0200 ++++ mozilla.new/configure.in 2006-10-01 23:31:14.308549000 +0200 +@@ -4243,7 +4243,7 @@ + + browser) + MOZ_APP_NAME=firefox +- MOZ_APP_DISPLAYNAME=BonEcho ++ MOZ_APP_DISPLAYNAME=MozillaFirefox + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_SAFE_BROWSING=1 diff --git a/mozilla-firefox-nss-system-nspr.patch b/mozilla-firefox-nss-system-nspr.patch deleted file mode 100644 index f92abe7..0000000 --- a/mozilla-firefox-nss-system-nspr.patch +++ /dev/null @@ -1,124 +0,0 @@ -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 diff --git a/mozilla-firefox-nss.patch b/mozilla-firefox-nss.patch deleted file mode 100644 index b740331..0000000 --- a/mozilla-firefox-nss.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -ur firefox.orig/config/config.mk firefox/config/config.mk ---- firefox.orig/config/config.mk 2004-06-05 02:26:13.000000000 +0200 -+++ firefox/config/config.mk 2004-06-16 09:42:32.000000000 +0200 -@@ -169,7 +169,7 @@ - - NSS_LIBS = \ - $(LIBS_DIR) \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -+ -lcrmf \ - -lsmime3 \ - -lssl3 \ - -lnss3 \ -@@ -189,11 +189,6 @@ - endif - - NSS_DEP_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ -- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ - $(NULL) - - MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) -diff -ur firefox.orig/security/manager/Makefile.in firefox/security/manager/Makefile.in ---- firefox.orig/security/manager/Makefile.in 2004-03-23 05:15:56.000000000 +0100 -+++ firefox/security/manager/Makefile.in 2004-06-16 09:48:35.000000000 +0200 -@@ -148,43 +148,6 @@ - else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif --ifndef DISABLE_DIST_GRE -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) --endif --endif --ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_MODULES -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin --endif --endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - ifdef MOZ_XUL -diff -ur firefox.orig/security/manager/ssl/src/Makefile.in firefox/security/manager/ssl/src/Makefile.in ---- firefox.orig/security/manager/ssl/src/Makefile.in 2004-01-07 14:36:51.000000000 +0100 -+++ firefox/security/manager/ssl/src/Makefile.in 2004-06-16 09:42:34.000000000 +0200 -@@ -116,7 +116,7 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += -I$(DIST)/public/nss \ -+LOCAL_INCLUDES += -I/usr/include/nss \ - $(NULL) - - EXTRA_DSO_LDOPTS += \ diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 890cff5..5450946 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -1,4 +1,3 @@ -# # TODO: # - with new gcc version (it is possible that) # - -fvisibility=hiddenn and ac_cv_visibility_pragma=no can be removed @@ -7,8 +6,10 @@ # 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) @@ -17,22 +18,20 @@ 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 @@ -46,8 +45,8 @@ BuildRequires: libIDL-devel >= 0.8.0 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 @@ -58,10 +57,10 @@ 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-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) @@ -69,6 +68,7 @@ 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 @@ -85,7 +85,8 @@ 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-2 +Requires: nspr-devel >= 1:4.6.3 +Requires: nss-devel >= 1:3.11.3-3 Obsoletes: mozilla-devel %description devel @@ -112,35 +113,29 @@ Angloj %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} @@ -154,19 +149,32 @@ 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}" +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 @@ -174,30 +182,58 @@ 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-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}" @@ -206,54 +242,41 @@ EOF 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 @@ -262,26 +285,24 @@ sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g 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 @@ -289,28 +310,13 @@ 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 <