Author: qboosh Date: Fri Aug 19 18:02:07 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.0.1
---- Files affected:
packages/mozilla-firefox:
mozilla-firefox-agent.patch (1.2 -> 1.3) , mozilla-firefox-install.patch
(1.3 -> 1.4) , mozilla-firefox-no-subshell.patch (1.1 -> 1.2) ,
mozilla-firefox-prefs.patch (1.5 -> 1.6) , mozilla-firefox.spec (1.273 ->
1.274) , mozilla-firefox-libpng.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mozilla-firefox/mozilla-firefox-agent.patch
diff -u packages/mozilla-firefox/mozilla-firefox-agent.patch:1.2
packages/mozilla-firefox/mozilla-firefox-agent.patch:1.3
--- packages/mozilla-firefox/mozilla-firefox-agent.patch:1.2 Tue Jun 12
09:03:51 2007
+++ packages/mozilla-firefox/mozilla-firefox-agent.patch Fri Aug 19
20:02:02 2011
@@ -1,9 +1,9 @@
--- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21
17:21:55.000000000 +0100
+++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21
17:23:53.000000000 +0100
@@ -163,6 +163,9 @@
+
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
- pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
+pref("general.useragent.vendor", "PLD");
+pref("general.useragent.vendorSub", "3.0");
+pref("general.useragent.vendorComment", "Th");
================================================================
Index: packages/mozilla-firefox/mozilla-firefox-install.patch
diff -u packages/mozilla-firefox/mozilla-firefox-install.patch:1.3
packages/mozilla-firefox/mozilla-firefox-install.patch:1.4
--- packages/mozilla-firefox/mozilla-firefox-install.patch:1.3 Wed May 26
09:05:02 2010
+++ packages/mozilla-firefox/mozilla-firefox-install.patch Fri Aug 19
20:02:02 2011
@@ -1,36 +1,3 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.org 2010-01-21
21:10:00.234466295 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2010-01-21
21:10:29.847369216 +0100
-@@ -362,13 +362,13 @@
- # NOTE: this must be a tar now that dist links into the tree so that we
- # do not strip the binaries actually in the tree.
- @echo "Creating package directory..."
-- @mkdir $(DIST)/$(MOZ_PKG_DIR)
-+ @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
- ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
-- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
- "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
-+ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -377,11 +377,11 @@
- ifndef STAGE_SDK
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif
- endif
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- @echo "Linking XPT files..."
- @rm -rf $(DIST)/xpt
- @$(NSINSTALL) -D $(DIST)/xpt
--- mozilla/browser/app/Makefile.in 2008-06-22 22:54:03.000000000 +0200
+++ mozilla/browser/app/Makefile.in 2008-06-23 10:34:59.000000000 +0200
@@ -397,7 +397,7 @@
@@ -60,3 +27,66 @@
endif # cocoa
endif # SKIP_COPY_XULRUNNER
endif # LIBXUL_SDK
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19
00:34:12.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22
23:53:43.877485659 +0100
+@@ -496,30 +496,30 @@
+ endif
+
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
+- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
$(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg
$@ $(EXCLUDE_LIST)
+ # NOTE: this must be a tar now that dist links into the tree so that we
+ # do not strip the binaries actually in the tree.
+ @echo "Creating package directory..."
+- @mkdir $(DIST)/$(MOZ_PKG_DIR)
++ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
+ ifdef MOZ_PKG_MANIFEST
+ $(RM) -rf $(DIST)/xpt $(DIST)/manifests
+ $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+ "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x
"$(XPIDL_LINK)"
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
+ $(patsubst
%,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
+ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
++ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+ $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+- printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
++ printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
+ else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ ifndef STAGE_SDK
+@@ -529,10 +529,10 @@
+ @$(NSINSTALL) -D $(DIST)/xpt
+ @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp
$(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces
$(MOZ_PKG_APPNAME).xpt\n"
>$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest)
|| echo No *.xpt files found in:
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ endif
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
+ @echo "Linking XPT files..."
+ @rm -rf $(DIST)/xpt
+ @$(NSINSTALL) -D $(DIST)/xpt
+@@ -620,7 +620,7 @@
+ cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
+ endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
+- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(bindir)
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
================================================================
Index: packages/mozilla-firefox/mozilla-firefox-no-subshell.patch
diff -u packages/mozilla-firefox/mozilla-firefox-no-subshell.patch:1.1
packages/mozilla-firefox/mozilla-firefox-no-subshell.patch:1.2
--- packages/mozilla-firefox/mozilla-firefox-no-subshell.patch:1.1 Wed May
26 09:05:02 2010
+++ packages/mozilla-firefox/mozilla-firefox-no-subshell.patch Fri Aug 19
20:02:02 2011
@@ -9,15 +9,3 @@
fi
exit $exitcode
---- iceweasel-3.0.10/mozilla/build/unix/mozilla.in~ 2007-10-05
10:29:26.000000000 +0300
-+++ iceweasel-3.0.10/mozilla/build/unix/mozilla.in 2009-05-05
19:26:08.278322082 +0300
-@@ -135,8 +135,5 @@
- then
- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
--exitcode=$?
--
--exit $exitcode
-+exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
- # EOF.
================================================================
Index: packages/mozilla-firefox/mozilla-firefox-prefs.patch
diff -u packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.5
packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.6
--- packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.5 Wed May 26
09:05:02 2010
+++ packages/mozilla-firefox/mozilla-firefox-prefs.patch Fri Aug 19
20:02:02 2011
@@ -2,7 +2,7 @@
--- mozilla.orig/browser/app/profile/firefox.js 2008-06-21
12:55:30.000000000 +0200
+++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000
+0200
@@ -89,12 +89,12 @@
- // App-specific update preferences
+ pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
-pref("app.update.enabled", true);
@@ -25,14 +25,15 @@
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 =
resume previous browser session
// The behavior of option 3 is detailed at:
http://wiki.mozilla.org/Session_Restore
-@@ -391,6 +394,7 @@
- pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign,
2-dontUse
+@@ -391,6 +394,8 @@
+ // 0: no backups created (and deletes all existing backups)
+ pref("browser.bookmarks.max_backups", 10);
- // l12n and i18n
+pref("intl.locale.matchOS", true);
- pref("intl.accept_languages", "chrome://global/locale/intl.properties");
- pref("intl.charsetmenu.browser.static",
"chrome://global/locale/intl.properties");
- pref("intl.charsetmenu.browser.more1",
"chrome://global/locale/intl.properties");
++
+ // Scripts & Windows prefs
+ pref("dom.disable_open_during_load", true);
+ pref("javascript.options.showInConsole", true);
@@ -445,7 +445,7 @@
pref("alerts.totalOpenTime", 4000);
@@ -40,29 +41,16 @@
-pref("browser.xul.error_pages.expert_bad_cert", false);
+pref("browser.xul.error_pages.expert_bad_cert", true);
- // We want to make sure mail URLs are handled externally...
- pref("network.protocol-handler.external.mailto", true); // for mail
-@@ -592,10 +592,10 @@
-
- #ifdef MOZ_SAFE_BROWSING
- // Safe browsing does nothing unless this pref is set
--pref("browser.safebrowsing.enabled", true);
-+pref("browser.safebrowsing.enabled", false);
-
- // Prevent loading of pages identified as malware
--pref("browser.safebrowsing.malware.enabled", true);
-+pref("browser.safebrowsing.malware.enabled", false);
-
- // Non-enhanced mode (local url lists) URL list to check for updates
- pref("browser.safebrowsing.provider.0.updateURL",
"http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1";);
+ // Work Offline is best manually managed by the user.
+ pref("network.manage-offline-status", false);
diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd
mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
--- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd
2008-06-21 12:55:30.000000000 +0200
+++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
2008-06-22 13:52:26.000000000 +0200
@@ -175,6 +175,6 @@
- <!ENTITY securityOverride.warningText "
+ <!ENTITY securityOverride.warningContent "
<p>You should not add an exception if you are using an internet connection
that you do not trust completely or if you are not used to seeing a warning for
this server.</p>
--<xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
- <xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/>
-+<xul:button
xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
+-<button
id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
+ <button
id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
++<button
id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
">
================================================================
Index: packages/mozilla-firefox/mozilla-firefox.spec
diff -u packages/mozilla-firefox/mozilla-firefox.spec:1.273
packages/mozilla-firefox/mozilla-firefox.spec:1.274
--- packages/mozilla-firefox/mozilla-firefox.spec:1.273 Sat Mar 12 07:54:34 2011
+++ packages/mozilla-firefox/mozilla-firefox.spec Fri Aug 19 20:02:02 2011
@@ -22,10 +22,6 @@
%undefine with_gnomevfs
%endif
-# convert firefox release number to platform version: 3.6.x -> 1.9.2.x
-%define xulrunner_main 1.9.2
-%define xulrunner_ver %(v=%{version}; echo
%{xulrunner_main}${v#3.6})
-
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
%define sqlite_build_version %(pkg-config --silence-errors
--modversion sqlite3 2>/dev/null || echo ERROR)
@@ -34,12 +30,12 @@
Summary: Firefox Community Edition web browser
Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
Name: mozilla-firefox
-Version: 3.6.15
+Version: 5.0.1
Release: 1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0:
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: fcf8042948d91f1f3d9c33599b79cf35
+# Source0-md5: 6d1f43e402cec84459a3d7f950bd5192
Source1: %{name}.desktop
Source2: %{name}.sh
Patch0: %{name}-install.patch
@@ -51,13 +47,13 @@
Patch6: %{name}-prefs.patch
Patch7: %{name}-nss_cflags.patch
Patch8: %{name}-no-subshell.patch
-Patch9: %{name}-libpng.patch
URL: http://www.mozilla.org/projects/firefox/
%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
+BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
BuildRequires: automake
BuildRequires: bzip2-devel
-BuildRequires: cairo-devel >= 1.8.8
+BuildRequires: cairo-devel >= 1.10.2-5
BuildRequires: dbus-glib-devel >= 0.60
%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
BuildRequires: gtk+2-devel >= 2:2.10
@@ -65,31 +61,34 @@
BuildRequires: hunspell-devel
BuildRequires: libIDL-devel >= 0.8.0
BuildRequires: libdnet-devel
+BuildRequires: libevent-devel >= 1.4.7
%{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0}
%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libnotify-devel >= 0.4
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 1.2.17
+BuildRequires: libpng-devel >= 1.4.1
BuildRequires: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.8.6
-BuildRequires: nss-devel >= 1:3.12.8
+BuildRequires: libvpx-devel
+BuildRequires: nspr-devel >= 1:4.8.7
+BuildRequires: nss-devel >= 1:3.12.9
BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
BuildRequires: python-modules
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: sqlite3-devel >= 3.7.2
+BuildRequires: sqlite3-devel >= 3.7.5-2
BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libXScrnSaver-devel
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
%if %{with xulrunner}
-BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
+BuildRequires: xulrunner-devel >= 2:%{version}
%endif
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
@@ -98,13 +97,14 @@
%requires_eq_to xulrunner xulrunner-devel
%else
Requires: browser-plugins >= 2.0
-Requires: cairo >= 1.8.8
+Requires: cairo >= 1.10.2-5
Requires: dbus-glib >= 0.60
Requires: gtk+2 >= 2:2.18
+Requires: libpng >= 1.4.1
Requires: libpng(APNG) >= 0.10
Requires: myspell-common
-Requires: nspr >= 1:4.8.6
-Requires: nss >= 1:3.12.8
+Requires: nspr >= 1:4.8.7
+Requires: nss >= 1:3.12.9
Requires: pango >= 1:1.14.0
Requires: sqlite3 >= %{sqlite_build_version}
Requires: startup-notification >= 0.8
@@ -118,7 +118,7 @@
# don't satisfy other packages (don't use %{name} here)
%define _noautoprovfiles %{_libdir}/mozilla-firefox
# and as we don't provide them, don't require either
-%define _noautoreq libmozjs.so libxpcom.so libxul.so
libjemalloc.so
+%define _noautoreq libmozjs.so libxpcom.so libxul.so
%{!?with_xulrunner:libmozalloc.so}
%if "%{cc_version}" >= "3.4"
%define specflags -fno-strict-aliasing -fno-tree-vrp
-fno-stack-protector
@@ -137,7 +137,7 @@
%prep
%setup -qc
-mv -f mozilla-%{xulrunner_main} mozilla
+mv -f mozilla-release mozilla
cd mozilla
%patch0 -p1
@@ -162,7 +162,6 @@
%patch6 -p1
%patch7 -p1
%patch8 -p2
-%patch9 -p0
%build
cd mozilla
@@ -211,25 +210,19 @@
%else
ac_add_options --disable-gnomeui
%endif
-%if %{with gnomevfs}
-ac_add_options --enable-gnomevfs
-%else
ac_add_options --disable-gnomevfs
-%endif
ac_add_options --disable-crashreporter
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
ac_add_options --disable-updater
-ac_add_options --disable-xprint
-ac_add_options --enable-canvas
+ac_add_options --enable-gio
ac_add_options --enable-libxul
ac_add_options --enable-pango
+ac_add_options --enable-shared-js
ac_add_options --enable-startup-notification
-ac_add_options --enable-svg
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --enable-xinerama
ac_add_options --with-distribution-id=org.pld-linux
%if %{with xulrunner}
ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
@@ -237,6 +230,8 @@
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
@@ -244,7 +239,7 @@
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
EOF
-%{__make} -j1 -f client.mk build \
+%{__make} -f client.mk build \
STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
@@ -261,12 +256,17 @@
%{__make} -C obj-%{_target_cpu}/browser/installer stage-package \
DESTDIR=$RPM_BUILD_ROOT \
- MOZ_PKG_APPDIR=%{_libdir}/%{name} \
+ MOZ_PKG_DIR=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
install -d \
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+%if %{with xulrunner}
+# >= 5.0 seems to require this
+ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
+%endif
+
# 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
@@ -274,9 +274,8 @@
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
$RPM_BUILD_ROOT%{_datadir}/%{name}/icons
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
$RPM_BUILD_ROOT%{_datadir}/%{name}/modules
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
$RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browserconfig.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}
%if %{without xulrunner}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
$RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js
$RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs.js
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
%endif
@@ -286,9 +285,8 @@
ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
ln -s ../../share/%{name}/searchplugins
$RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
-ln -s ../../share/%{name}/browserconfig.properties
$RPM_BUILD_ROOT%{_libdir}/%{name}
%if %{without xulrunner}
-ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
+ln -s ../../share/%{name}/greprefs.js
$RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js
ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
%endif
@@ -311,9 +309,7 @@
%if %{with xulrunner}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
%endif
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
@@ -339,7 +335,7 @@
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 res searchplugins; do
+for d in chrome defaults extensions greprefs.js icons res searchplugins; do
if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
install -d %{_datadir}/%{name}
mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
@@ -382,51 +378,65 @@
%endif
# config?
-%{_libdir}/%{name}/.autoreg
%{_libdir}/%{name}/application.ini
+%{_libdir}/%{name}/chrome.manifest
%dir %{_libdir}/%{name}/components
%{_libdir}/%{name}/components/FeedConverter.js
%{_libdir}/%{name}/components/FeedWriter.js
+%{_libdir}/%{name}/components/PlacesProtocolHandler.js
+%{_libdir}/%{name}/components/Weave.js
%{_libdir}/%{name}/components/WebContentConverter.js
%{_libdir}/%{name}/components/browser.xpt
%{_libdir}/%{name}/components/fuelApplication.js
%{_libdir}/%{name}/components/nsBrowserContentHandler.js
%{_libdir}/%{name}/components/nsBrowserGlue.js
-%{_libdir}/%{name}/components/nsMicrosummaryService.js
-%{_libdir}/%{name}/components/nsPlacesTransactionsService.js
%{_libdir}/%{name}/components/nsPrivateBrowsingService.js
%{_libdir}/%{name}/components/nsSafebrowsingApplication.js
%{_libdir}/%{name}/components/nsSessionStartup.js
%{_libdir}/%{name}/components/nsSessionStore.js
%{_libdir}/%{name}/components/nsSetDefaultBrowser.js
%{_libdir}/%{name}/components/nsSidebar.js
+
+%{_libdir}/%{name}/components/components.manifest
+%{_libdir}/%{name}/components/interfaces.manifest
+
%if %{without xulrunner}
%{_libdir}/%{name}/platform.ini
+%{_libdir}/%{name}/components/ConsoleAPI.js
%{_libdir}/%{name}/components/FeedProcessor.js
%{_libdir}/%{name}/components/GPSDGeolocationProvider.js
%{_libdir}/%{name}/components/NetworkGeolocationProvider.js
+%{_libdir}/%{name}/components/PlacesCategoriesStarter.js
+%{_libdir}/%{name}/components/addonManager.js
+%{_libdir}/%{name}/components/amContentHandler.js
+%{_libdir}/%{name}/components/amWebInstallListener.js
+%{_libdir}/%{name}/components/contentAreaDropListener.js
+%{_libdir}/%{name}/components/contentSecurityPolicy.js
+%{_libdir}/%{name}/components/crypto-SDR.js
%{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/nsAddonRepository.js
%{_libdir}/%{name}/components/nsBadCertHandler.js
%{_libdir}/%{name}/components/nsBlocklistService.js
%{_libdir}/%{name}/components/nsContentDispatchChooser.js
%{_libdir}/%{name}/components/nsContentPrefService.js
%{_libdir}/%{name}/components/nsDefaultCLH.js
%{_libdir}/%{name}/components/nsDownloadManagerUI.js
-%{_libdir}/%{name}/components/nsExtensionManager.js
%{_libdir}/%{name}/components/nsFilePicker.js
%{_libdir}/%{name}/components/nsFormAutoComplete.js
+%{_libdir}/%{name}/components/nsFormHistory.js
%{_libdir}/%{name}/components/nsHandlerService.js
%{_libdir}/%{name}/components/nsHelperAppDlg.js
%{_libdir}/%{name}/components/nsINIProcessor.js
+%{_libdir}/%{name}/components/nsInputListAutoComplete.js
%{_libdir}/%{name}/components/nsLivemarkService.js
%{_libdir}/%{name}/components/nsLoginInfo.js
%{_libdir}/%{name}/components/nsLoginManager.js
%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
+%{_libdir}/%{name}/components/nsMicrosummaryService.js
%{_libdir}/%{name}/components/nsPlacesAutoComplete.js
-%{_libdir}/%{name}/components/nsPlacesDBFlush.js
+%{_libdir}/%{name}/components/nsPlacesExpiration.js
+%{_libdir}/%{name}/components/nsPrompter.js
%{_libdir}/%{name}/components/nsProxyAutoConfig.js
%{_libdir}/%{name}/components/nsSearchService.js
%{_libdir}/%{name}/components/nsSearchSuggestions.js
@@ -437,22 +447,18 @@
%{_libdir}/%{name}/components/nsUrlClassifierLib.js
%{_libdir}/%{name}/components/nsUrlClassifierListManager.js
%{_libdir}/%{name}/components/nsWebHandlerApp.js
-%{_libdir}/%{name}/components/pluginGlue.js
%{_libdir}/%{name}/components/storage-Legacy.js
%{_libdir}/%{name}/components/storage-mozStorage.js
%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
%endif
%attr(755,root,root) %{_libdir}/%{name}/components/libbrowsercomps.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libbrowserdirprovider.so
%if %{without xulrunner}
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
%endif
%if %{with gnomevfs} && %{without xulrunner}
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
-%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
%endif
%attr(755,root,root) %{_libdir}/%{name}/firefox
@@ -460,10 +466,10 @@
%if %{without xulrunner}
%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
%endif
+
%{_pixmapsdir}/mozilla-firefox.png
%{_desktopdir}/mozilla-firefox.desktop
@@ -474,10 +480,11 @@
%{_libdir}/%{name}/icons
%{_libdir}/%{name}/modules
%{_libdir}/%{name}/searchplugins
-%{_libdir}/%{name}/browserconfig.properties
-%if %{without xulrunner}
+%if %{with xulrunner}
+%{_libdir}/%{name}/xulrunner
+%else
%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/greprefs.js
%{_libdir}/%{name}/res
%endif
@@ -487,9 +494,8 @@
%{_datadir}/%{name}/icons
%{_datadir}/%{name}/modules
%{_datadir}/%{name}/searchplugins
-%{_datadir}/%{name}/browserconfig.properties
%if %{without xulrunner}
-%{_datadir}/%{name}/greprefs
+%{_datadir}/%{name}/greprefs.js
%{_datadir}/%{name}/res
%endif
@@ -509,6 +515,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.274 2011/08/19 18:02:02 qboosh
+- updated to 5.0.1
+
Revision 1.273 2011/03/12 06:54:34 qboosh
- updated to 3.6.15, fixes:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-agent.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-install.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-no-subshell.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-prefs.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox.spec?r1=1.273&r2=1.274&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
