rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=38

Browse Source
This commit is contained in:
OBS User unknown 2008-09-26 14:53:00 +00:00 committed by Git OBS Bridge
parent f20dca8a37
commit 96e5400ee4
11 changed files with 143 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MozillaFirefox-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("no-jar-manifest")

17
MozillaFirefox.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Sep 25 14:47:13 CDT 2008 - maw@suse.de
- Review and approve changes.
-------------------------------------------------------------------
Mon Sep 15 13:45:16 CEST 2008 - wr@rosenauer.org
- update to security/maintenance release 3.0.2 (bnc#429179)
- removed unused files from sources
- fix more rpmlint complaints and provide a config file to filter
false positives
- disable Gnome crashreporter as it has no value
- brought man-page up to date for the firefox stub
(removing firefox-bin reference)
- en-US locale not longer packaged in translations subpackage
-------------------------------------------------------------------
Fri Aug 15 18:56:26 CDT 2008 - maw@novell.com

69
MozillaFirefox.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package MozillaFirefox (Version 3.0.1)
# spec file for package MozillaFirefox (Version 3.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -26,13 +26,14 @@ BuildRequires: fdupes
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Provides: web_browser
Provides: firefox
Version: 3.0.1
Release: 14
Version: 3.0.2
Release: 1
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
Source: firefox-%{version}-source.tar.bz2
Source1: MozillaFirefox.desktop
Source2: %{name}-rpmlintrc
Source3: mozilla.sh.in
Source4: find-external-requires.sh
Source7: l10n-%{version}.tar.bz2
@ -46,16 +47,16 @@ Patch2: firefox-no-update.patch
Patch14: credits.patch
Patch17: firefox-appname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils
PreReq: coreutils /bin/sh gconf2 shared-mime-info desktop-file-utils
Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190)
Requires: %{name}-branding >= 3.0
%define _unpackaged_files_terminate_build 0
%define _use_internal_dependency_generator 0
%define __find_requires sh %{SOURCE4}
%define __find_provides %{nil}
%define releasedate 2008070400
%define releasedate 2008091700
%define progname firefox
%define progdir %{_prefix}/%_lib/firefox
%define progdir %{_prefix}/%_lib/%{progname}
%if %suse_version > 1020
%define gnome_confdir %{_sysconfdir}
%define gnome_dir %{_prefix}
@ -65,8 +66,8 @@ Requires: %{name}-branding >= 3.0
%define gnome_dir /opt/gnome
%endif
### build options
%define milestone 1
%define localize 1
%define branding 1
%define localize 1
### build options end
%description
@ -82,10 +83,12 @@ Authors:
--------
Mozilla Foundation <drivers@mozilla.org>
%if %localize
%package translations
Summary: Translations for MozillaFirefox
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Provides: locale(%{name}:af;ar;be;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;id;it;ja;ka;ko;ku;lt;mk;mn;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;tr;uk;zh_CN;zh_TW)
Provides: locale(%{name}:af;ar;be;bn_IN;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;mk;mn;mr;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW)
Group: Productivity/Networking/Web/Browsers
PreReq: %{name} = %{version}
Requires: mozilla-xulrunner190-translations
@ -100,12 +103,14 @@ Authors:
--------
Mozilla Foundation <drivers@mozilla.org>
%endif
%package branding-upstream
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Summary: Mozilla Firefox Web Browser
Group: Productivity/Networking/Web/Browsers
Provides: %{name}-branding = %{version}
Supplements: packageand(branding-upstream:%{name})
Supplements: packageand(%{name}:branding-upstream)
#BRAND: Provide two files -
#BRAND: /usr/lib/firefox/browserconfig.properties that contains the
#BRAND: default homepage and some other default configuration options
@ -141,7 +146,7 @@ cd $RPM_BUILD_DIR/mozilla
export MOZ_BUILD_DATE=%{releasedate}
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing -fstack-protector"
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
SDKDIR=$(pkg-config --variable=sdkdir libxul)
@ -167,7 +172,7 @@ ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-crashreporter
EOF
%if %milestone
%if %branding
cat << EOF >> $MOZCONFIG
ac_add_options --enable-official-branding
EOF
@ -184,8 +189,7 @@ cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
echo %defattr\(-,root,root\) > %{_tmppath}/translations.list
for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
case $locale in
ja-JP-mac)
# broken locales, do not work
ja-JP-mac|en-US)
;;
*)
make -C browser/locales libs-$locale
@ -210,17 +214,17 @@ ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT/usr/bin/%{progname}
# desktop definition
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
install -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/applications
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
# additional mime-types
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/firefox.xml
cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
# SCHEMA File
mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas
install -m 644 %{SOURCE18} \
$RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/
# install man-page
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/
cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1
# apply SUSE defaults
sed -e 's,RPM_VERSION,%{version}-%{release},g' \
%{SOURCE17} > suse-default-prefs
@ -234,13 +238,13 @@ EOF
# ADDONS
#
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
%if %milestone
cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png
%if %branding
cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/firefox.png
ln -sf firefox.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox-gnome.png
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/%{progname}.png
ln -sf %{progname}.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
%else
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.xpm
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm
%endif
%suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
%if %suse_version > 1020
@ -248,8 +252,8 @@ cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pi
%fdupes $RPM_BUILD_ROOT%{progdir}
%fdupes $RPM_BUILD_ROOT%{_datadir}
%endif
%if %milestone
chmod -x $RPM_BUILD_ROOT%{_datadir}/pixmaps/firefox.png
%if %branding
chmod -x $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{progname}.png
%endif
%clean
@ -344,13 +348,13 @@ fi
%if %suse_version <= 1020
%{gnome_confdir}/gconf/schemas/firefox.schemas
%endif
%{_datadir}/mime/packages/firefox.xml
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*
%if %milestone
%if %branding
%{gnome_dir}/share/icons/hicolor/
%endif
%{_bindir}/%{progname}
%doc %{_mandir}/man1/firefox.1.gz
%doc %{_mandir}/man1/%{progname}.1.gz
%if %localize
%files translations -f %{_tmppath}/translations.list
@ -364,6 +368,17 @@ fi
%{progdir}/defaults/preferences/firefox-build.js
%changelog
* Thu Sep 25 2008 maw@suse.de
- Review and approve changes.
* Mon Sep 15 2008 wr@rosenauer.org
- update to security/maintenance release 3.0.2 (bnc#429179)
- removed unused files from sources
- fix more rpmlint complaints and provide a config file to filter
false positives
- disable Gnome crashreporter as it has no value
- brought man-page up to date for the firefox stub
(removing firefox-bin reference)
- en-US locale not longer packaged in translations subpackage
* Fri Aug 15 2008 maw@novell.com
- Review and approve changes.
* Mon Aug 04 2008 wr@rosenauer.org

3
firefox-3.0.1-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcc36107fc8d44228637785f77e96b4457e2a34f8b21f5f89508875b7d9f02a0
size 36809914

3
firefox-3.0.2-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae8ac9a257c191c0c689103b727eb79c91a863e072e1a596b87ae845e7fd8f7d
size 36830722

11
firefox-appname.patch
View File

@ -1,14 +1,3 @@
--- browser/app/profile/firefox.js
+++ browser/app/profile/firefox.js
@@ -173,7 +173,7 @@
// Whether or not the application should check at startup each time if it
// is the default browser.
-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
// 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
--- browser/components/shell/src/nsGNOMEShellService.cpp
+++ browser/components/shell/src/nsGNOMEShellService.cpp
@@ -133,7 +133,11 @@

139
firefox-no-update.patch
View File

@ -1,59 +1,14 @@
Index: browser/components/preferences/advanced.js
===================================================================
RCS file: /cvsroot/mozilla/browser/components/preferences/advanced.js,v
retrieving revision 1.27
diff -u -p -6 -r1.27 advanced.js
--- browser/components/preferences/advanced.js 9 Oct 2007 17:24:35 -0000 1.27
+++ browser/components/preferences/advanced.js 28 Nov 2007 15:30:36 -0000
@@ -241,12 +241,14 @@ var gAdvancedPane = {
getService(Components.interfaces.nsIApplicationUpdateService);
var enabledPref = document.getElementById("app.update.enabled");
var enableAppUpdate = document.getElementById("enableAppUpdate");
enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
+ enableAppUpdate.disabled = true;
+ enableAppUpdate.hidden = true;
},
/**
* Enables/disables UI for "when updates are found" based on the values,
* and "locked" states of associated preferences.
*/
Index: browser/base/content/baseMenuOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/baseMenuOverlay.xul,v
retrieving revision 1.16
diff -u -p -6 -r1.16 baseMenuOverlay.xul
--- browser/base/content/baseMenuOverlay.xul 1 Apr 2007 05:22:56 -0000 1.16
+++ browser/base/content/baseMenuOverlay.xul 29 Nov 2007 13:11:29 -0000
@@ -94,17 +94,17 @@
#endif
<menuitem id="releaseNotes"
accesskey="&helpReleaseNotes.accesskey;"
label="&helpReleaseNotes.label;"
oncommand="openReleaseNotes(event)"
onclick="checkForMiddleClick(this, event);"/>
- <menuseparator id="updateSeparator"/>
<menuitem id="checkForUpdates"
accesskey="&updateCmd.accesskey;"
label="&updateCmd.label;"
class="menuitem-iconic"
+ hidden="true"
oncommand="checkForUpdates();"/>
<menuseparator id="aboutSeparator"/>
<menuitem id="aboutName"
accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
oncommand="openAboutDialog();"/>
Index: browser/app/profile/firefox.js
===================================================================
RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v
retrieving revision 1.252
diff -u -p -r1.252 firefox.js
--- browser/app/profile/firefox.js 12 Jan 2008 22:22:03 -0000 1.252
+++ browser/app/profile/firefox.js 18 Jan 2008 21:26:09 -0000
@@ -77,66 +77,6 @@ pref("extensions.blocklist.detailsURL",
retrieving revision 1.338
diff -u -p -6 -r1.338 firefox.js
--- browser/app/profile/firefox.js 21 Jul 2008 18:47:20 -0000 1.338
+++ browser/app/profile/firefox.js 15 Sep 2008 13:50:07 -0000
@@ -83,72 +83,12 @@ pref("extensions.blocklist.interval", 86
pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/");
// Dictionary download preference
pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/");
@ -120,25 +75,75 @@ diff -u -p -r1.252 firefox.js
// Symmetric (can be overridden by individual extensions) update preferences.
// e.g.
// extensions.{GUID}.update.enabled
// extensions.{GUID}.update.url
// extensions.{GUID}.update.interval
// .. etc ..
Index: browser/base/content/baseMenuOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/baseMenuOverlay.xul,v
retrieving revision 1.21
diff -u -p -6 -r1.21 baseMenuOverlay.xul
--- browser/base/content/baseMenuOverlay.xul 6 May 2008 04:07:24 -0000 1.21
+++ browser/base/content/baseMenuOverlay.xul 15 Sep 2008 13:50:07 -0000
@@ -94,17 +94,17 @@
#endif
<menuitem id="releaseNotes"
accesskey="&helpReleaseNotes.accesskey;"
label="&helpReleaseNotes.label;"
oncommand="openReleaseNotes(event)"
onclick="checkForMiddleClick(this, event);"/>
- <menuseparator id="updateSeparator"/>
<menuitem id="checkForUpdates"
accesskey="&updateCmd.accesskey;"
label="&updateCmd.label;"
class="menuitem-iconic"
+ hidden="true"
oncommand="checkForUpdates();"/>
<menuseparator id="aboutSeparator"/>
<menuitem id="aboutName"
accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
oncommand="openAboutDialog();"/>
Index: browser/components/preferences/advanced.js
===================================================================
RCS file: /cvsroot/mozilla/browser/components/preferences/advanced.js,v
retrieving revision 1.36
diff -u -p -6 -r1.36 advanced.js
--- browser/components/preferences/advanced.js 5 Apr 2008 00:18:08 -0000 1.36
+++ browser/components/preferences/advanced.js 15 Sep 2008 13:50:07 -0000
@@ -387,12 +387,14 @@ var gAdvancedPane = {
getService(Components.interfaces.nsIApplicationUpdateService);
var enabledPref = document.getElementById("app.update.enabled");
var enableAppUpdate = document.getElementById("enableAppUpdate");
enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
+ enableAppUpdate.disabled = true;
+ enableAppUpdate.hidden = true;
},
/**
* Enables/disables UI for "when updates are found" based on the values,
* and "locked" states of associated preferences.
*/
Index: browser/components/safebrowsing/content/report-phishing-overlay.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul,v
retrieving revision 1.12
diff -u -p -6 -r1.12 report-phishing-overlay.xul
--- browser/components/safebrowsing/content/report-phishing-overlay.xul 4 Mar 2008 16:05:13 -0000 1.12
+++ browser/components/safebrowsing/content/report-phishing-overlay.xul 27 Mar 2008 21:52:53 -0000
@@ -47,13 +47,13 @@
<!--<broadcaster id="reportPhishingErrorBroadcaster" disabled="true"/>-->
</broadcasterset>
<menupopup id="menu_HelpPopup">
<menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
label="&reportPhishSiteMenu.title2;"
accesskey="&reportPhishSiteMenu.accesskey;"
- insertbefore="updateSeparator"
+ insertbefore="aboutSeparator"
retrieving revision 1.13
diff -u -p -6 -r1.13 report-phishing-overlay.xul
--- browser/components/safebrowsing/content/report-phishing-overlay.xul 15 Aug 2008 19:36:20 -0000 1.13
+++ browser/components/safebrowsing/content/report-phishing-overlay.xul 15 Sep 2008 13:50:07 -0000
@@ -56,12 +56,12 @@
observes="reportPhishingBroadcaster"
oncommand="openUILink(safebrowsing.getReportURL('Phish'), event);"
onclick="checkForMiddleClick(this, event);"/>
<!-- XXX Bug 415846
<menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
label="&safeb.palm.notforgery.label2;"
accesskey="&reportPhishSiteMenu.accesskey;"
- insertbefore="updateSeparator"
+ insertbefore="aboutSeparator"
observes="reportPhishingErrorBroadcaster"
oncommand="openUILinkIn(safebrowsing.getReportURL('Error'), 'tab');"
onclick="checkForMiddleClick(this, event);"/>
</menupopup>
</overlay>

7
firefox.1
View File

@ -6,16 +6,13 @@ firefox \- a Web browser for X11 derived from the Mozilla browser
.B firefox
[\fIOPTIONS\fR] [\fIURL\fR]
.B firefox-bin
[\fIOPTIONS\fR] [\fIURL\fR]
.SH DESCRIPTION
\fBMozilla Firefox\fR is an open-source web browser, designed for
standards compliance, performance and portability.
.SH USAGE
\fBfirefox\fR is a simple shell script that will set up the
environment for the actual executable, \fBfirefox-bin\fR.
environment for the actual executable.
.SH OPTIONS
A summary of the options supported by \fBfirefox\fR is included below.
@ -113,7 +110,7 @@ Disables extensions and themes for this session.
\fI/usr/bin/firefox\fR - shell script wrapping
\fBfirefox\fR
.br
\fI/usr/lib/firefox/firefox-bin\fR - \fBfirefox\fR
\fI/usr/lib/firefox/firefox\fR - \fBfirefox\fR
executable
.SH VERSION

3
l10n-3.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2dee7af1fa9fb00e83dac00f4199884561729bcb6d3d04db08c17023af7527ad
size 28668988

3
l10n-3.0.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7501c685f9f862a9c35876aa9e8b7aa0d8b51ce15a8b73c0d4bbf497cb52aab
size 27561781

3
mozilla.sh.in
View File

@ -86,6 +86,9 @@ else
fi
fi
# disable Gnome crash dialog (doesn't make sense anyway)
export GNOME_DISABLE_CRASH_DIALOG=1
moz_debug=0
script_args=""
pass_arg_count=0